New crap
Merge branch 'Adam' of https://github.com/aj499/Project-4 into Adam

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