I don't even know added things and stuff ugh
Merge branch 'master' of https://github.com/Ethanmn/CPE476Lab1

Conflicts:
	Test_Again/GameObject.h