trying to fix edit game
Fixed Edit Game, it now works
Merge branch 'master' into gh-pages

Conflicts:
	.DS_Store