Merge branch 'sarah'

conflicts from added gems.
Merge branch 'master' of https://github.com/AkermanGreg/happy

diff.
added user and video model
Merge branch 'martina'
Merge branch 'master' of https://github.com/AkermanGreg/happy

Fixing Merge
Merge branch 'master' of https://github.com/AkermanGreg/happy

fixing local master
added angular
Some routes, homepage
Merge branch 'master' of https://github.com/AkermanGreg/happy

"Route Changes, updates to homepage"

:q
Merge branch 'master' into greg

"homepage updates, route changes"