redid ground_plane.obj
Merge branch 'master' of https://github.com/Ethanmn/CPE476Final

Conflicts:
	models/ground_plane.obj