Got project 2 into working shape.
Merge branch 'master' of https://github.com/EkardNT/CS165

Conflicts:
	Project2/Project2.vcxproj
	Project2/main.cpp