newest
Merge branch 'Lauren' into Mike
Merge branch 'Mike' of https://github.com/aj499/Project-4 into Mike
Merge branch 'Mike' into Lauren
woo
Merge branch 'Lauren' into Min

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