Merge pull request #31 from ParadiseSS13/master

Merge from Master
Foxes
Merge pull request #108 from Fox-McCloud/Foxes

Foxes
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Conflicts:
	maps/cyberiad.dmm