commented out map-loading, so can test with wander
Merge branch 'master' of https://github.com/WeirdCoder/rss-2014-team-3