Merge pull request #2 from BrunoChauvet/master

merge changes from Bruno
Fix merge conflicts
Merge branch 'master' of github.com:nickhargreaves/MapFour
update data
Merge branch 'master' of github.com:AkramDweikat/MapFour
Merge pull request #5 from BrunoChauvet/master

Fix conflicts