Moved map loading logic to its own class
Merge branch 'master' of github.com:zarokima/MastersProject