Changed to !
Merge branch 'master' of
https://github.com/Shelnutt2/COP3503_Project2.git

Conflicts:
	Project/src/test.cpp