Camera Pos + Mag Factor + Grass Plane
Merge branch 'master' of https://github.com/a0099654/CS4243-Project

Conflicts:
	Thumbs.db
	frame_3.png
	model.txt
	test.py
	texture/Thumbs.db