,hjewfdgskjvhs
Gravity prototype finished
Bezier started
Merge branch 'master' of https://github.com/twbentley/orbits

Conflicts:
	OrBITS.v11.suo
	OrBITS/Debug/OrBITS.log
	OrBITS/OrBITS.vcxproj
	OrBITS/OrBITS.vcxproj.filters
no message
Merge branch 'master' of https://github.com/twbentley/orbits

Conflicts:
	DSA2 Final Grading Guide.xlsx
	OrBITS.v11.suo
	OrBITS/Debug/OrBITS.log