Github is forcing me to commit this before I can pull
Merge branch 'master' of https://github.com/crowdpublishtv/teamawesome

Conflicts:
	app/views/static_pages/home.html.erb