BROKEN!
Merge branch 'master' of https://github.com/thefinn93/CSS342-Lab5

Conflicts:
	lab5/TestGitFunctionality.cpp