Bug fixed
Merge branch 'working' of https://github.com/tbupper90/project_4 into working

Conflicts:
	bin/GeoModel.class
	src/GeoDriver.java