Merge branch 'master' of https://github.com/PimV/Bermuda-TheGame into imageLoader
Merge pull request #5 from PimV/imageLoader

Uncommited merge commit?
Merge branch 'master' of https://github.com/PimV/Bermuda-TheGame into jsonMapLoading