formatting
Merge branch 'master' of github.com:PaperElectron/Magic-Sprites