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
show page for questions changes
fixed merge conflict on question show page
Merge branch 'master' of https://github.com/AkermanGreg/happy
:wq
erged conflicts
updates to video pages
updates to video pages
Delete 1213awb1uajib1khrr36_merged.webm
Delete 13mchq887h6j11opyeki_merged.webm
Delete 1oci8bz108ey441ikewmc_merged.webm
Delete 5gvuq21g8nbil1bbhe4x_merged.webm
Delete 6y5of3ghci401yy2ucw_merged.webm
Delete g7e1l9177pp0613pvq3c_merged.webm
Delete kzr47v1skj6vu1w3hl1m_merged.webm
Delete yc4g2lvedb7m13n5obb_merged.webm