fixes
Merge branch 'master' of https://github.com/Mahi-Mahi/FTV-NewsGame

Conflicts:
	app/views/play.html