Git Test Change
Merge branch 'master' of https://github.com/westdew/tvschedule

Conflicts:
	views/admin_layout.erb
Merge branch 'master' of https://github.com/westdew/tvschedule