Videos
gitignore changes.
Merge branch 'videos' into master

Conflicts:
	.gitignore
	rails/politicame/db/schema.rb