Style Updates
may have to roll this back
Fixed merge conflict
users controller, users show, users new
Fixed comment
remove href from div tag
precompiled assets locally:
video!!! mofo
videos!!!
Merge branch 'master' of https://github.com/AkermanGreg/happy

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

.
dropped my database and rake db created and migrated again
merged with video changes