add bootstrap
Merge branch 'master' of https://github.com/robhunter/healthystuff
foursquare ominauth
Merge branch 'master' of https://github.com/robhunter/healthystuff

Conflicts:
	Gemfile