Added twitter bootstrap to css
Merge branch 'master' of github.com:chrisjomaron/slickfit-web

Conflicts:
	views/home.erb