uh
Merge branch 'master' of https://github.com/Ethanmn/CPE476Lab1

Conflicts:
	Test_Again/Main.cpp