add video model
Merge branch 'master' into video-model

Conflicts:
	config/routes.rb
	db/schema.rb
Merge pull request #1 from delba/video-model

Video model