fix states
add temaplates and bootstrap
resolve conflicts (home vs work)
git push origin master
git status