Merge branch 'Mike' into Adam

Conflicts:
src/project/MapPanel.java
src/project/WelcomeWindow.java