Committing version of MP1 converted to CPP fully
some minor changes
Merge branch 'master' of https://github.com/redDevilz/randomProject

Conflicts:
	stdincludes.h