Merge branch 'master' of https://github.com/aj499/Project-4

Conflicts:
	src/project/MapPanel.java
	src/project/WelcomeWindow.java
Merging Min to Master