Merge pull request #1 from ClashOfBlocks/master

Merge
Merge pull request #2 from ClashOfBlocks/master

Merge
Removed debug stuff and fixed a saving bug
Merge pull request #19 from stilldabomb/master

Removed debug stuff and fixed a saving bug