Started work on World Generation
Merged Master and Feature/WorldGen
Merge pull request #2 from LordFokas/feature/worldgen

Merged master and worldgen. Also derp.