config
Merge branch 'master' of https://github.com/arcadeJHS/AvertiseInvaders

Conflicts:
	assets/php/config.php