start some basic work on the map holding, as everything will be simple
Merge branch 'master' of https://github.com/Jordach/BuildAndShoot