Cpp cleanup
Merge branch 'master' of https://github.com/ABHIMUCH/Project4

Conflicts:
	Project4/Project4/test1.cpp