Fixed a bunch of stuff
Merge branch 'master' of https://github.com/jebadirad/CSC335FinalProject

Conflicts:
	src/model/Terrain.java