yes.
Merge branch 'master' of github.com:icco/MTV

Conflicts:
	app/controllers.rb