Merge Fix
Merge branch 'Eric-Temp' of https://github.com/FrostTree-Games/MagnetBoy into Eric-Temp