Fix merge
Merge branch 'ARTestPlane' of https://github.com/mdfeist/CMPUT302W12T4 into ARTestPlane

Conflicts:
	ARTestPlane.sdf