Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #87 from bc5389/master

Mini Map Prototype
Merge remote-tracking branch 'upstream/master'
Simple fix to load level_testing when clicking offline
Build settings needed for loading the level to work
Merge pull request #89 from lightsoda/master

Load level level_testing when clicking offline