Merge branch 'Lauren' into Min

Conflicts:
	src/project/DataManager.java
	src/project/MapPanel.java
	src/project/WelcomeWindow.java
Merge branch 'Lauren' into Min

Conflicts:
	src/project/DataManager.java
	src/project/MapPanel.java
	src/project/WelcomeWindow.java
Figuring stuff out
Merge branch 'Adam' into Min

Conflicts:
	src/project/MapPanel.java
	src/project/StudentData.java
	src/project/WelcomeWindow.java
Syncing Complete
Merge remote-tracking branch 'origin/Min' into Mike

Conflicts:
	src/project/MapPanel.java