Fixed no response error
Merge branch 'combinedCode' of github.com:MattCMultimedia/guess_that_song into combinedCode

Conflicts:
	lib/gtsSmarty/templates_c/45700cc071f730a3011fa973ebf2ebcdd3e2d20d.file.gtsGame.tpl.php
Merge branch 'combinedCode' of github.com:MattCMultimedia/guess_that_song into combinedCode
Added song x of x functionality