Updates to sprites
Fixing merge conflicts
Merge branch 'master' of https://github.com/Starspell/Magic-Carpet-Robot-Battle