ha bon
Merge https://github.com/yakasan/SuperComics

Conflicts:
	controller/createController.php
	inc/header.inc.php
	process/addPlayer.php
	view/create.php