okl
Merge branch 'master' of https://github.com/drdeath86/comicsdealeradmin

Conflicts:
	altaComic.php