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

Conflicts:
	css/style.css
	view/create.php