Added more functionality, soon to work on actual gameplay
Merge remote-tracking branch 'origin/master'

Conflicts:
	htdocs/common/enterQ.php