commit for merge
Merge branch 'master' of github.com:tsnow/video

Conflicts:
	db/schema.rb