may have to roll this back
users controller, users show, users new
Merge branch 'master' of https://github.com/AkermanGreg/happy

.
dropped my database and rake db created and migrated again
merged with video changes
merged with sarah's video changes
Merge branch 'master' of https://github.com/AkermanGreg/happy
:wq
erged conflicts