update
Merge branch 'master' of https://github.com/arcadeJHS/AdvertiseInvaders

Conflicts:
	assets/game.min.js
update