added bower-rails and angular gems
test
Merge branch 'sarah'

conflicts with gems.
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
test
fixed merged-conflict
bootstrap navbar