merge
Merge branch 'master' of https://github.com/yakasan/SuperComics

Conflicts:
	controller/createController.php
	inc/header.inc.php