memory leak
Merge branch 'master' of https://github.com/jenniferballing/CS2Assignment5

Conflicts:
	CS2Assignment5/CS2Assignment5/Main.cpp