merge test
index / question pages, basic functionality
change
Merge branch 'master' of https://github.com/AkermanGreg/happy

merge
User shows on question, questions show on user
Merge branch 'master' into greg

Users on questions questions on users
adding comment model
Merge branch 'master' of https://github.com/AkermanGreg/happy

merge.
Merge branch 'master' into sarah

.
added crud for videos controller