Cannon stuff
Merge branch 'master' of https://github.com/Starspell/Magic-Carpet-Robot-Battle
Fixing corner block and updating carpet sprites
Fixing things