gyujg
Merge https://github.com/yakasan/SuperComics

Conflicts:
	controller/createController.php
	controller/gamePhase2Controller.php
	css/style.css
	inc/header.inc.php
	inc/header.inc.php~
	process/getChallenger.php