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

Conflicts:
	app/models/video.rb
change
Merge branch 'master' into sarah

.
added crud for videos controller