Added initial map load
Merge remote-tracking branch 'origin/master' into map
Merge pull request #1 from stratahacks/map

Added initial map load