test
fixed merged-conflict
bootstrap navbar
added bcrypt
added user and video model
Merge branch 'martina'
Merge branch 'master' of https://github.com/AkermanGreg/happy

fixing local master