Trying to get rocket code to work
Merge branch 'master' of https://github.com/SpexGuy/CS559Project2

Conflicts:
	CS559Project2/Mesh.h
	CS559Project2/main.cpp