Merge pull request #1 from AkermanGreg/greg

added bootstrap
added bower-rails and angular gems
Martina's first test commmit
Merge branch 'sarah'

conflicts with gems.
experiment
merge greg branch into master
Merge branch 'master' of https://github.com/AkermanGreg/happy

merge gems into maste
merge gems into masterr
merge martina branch
fixed merged-conflict
bootstrap navbar