Map generation, generation 2.
Merge branch 'master' of https://github.com/Nican/imgd4100