video.rb stash
merged test
merged test2
fixing merge
Getting Version with Question Model
test
Merge branch 'master' of https://github.com/AkermanGreg/happy

Conflicts:
	app/models/video.rb
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
fixed path in videos controller
full crud and relationship logic in views on questions / users
updates on user, question, video crud creation, relationship, functionality