changed main.cpp
Merge branch 'master' of github.com:enajork/codeProject

Conflicts:
	codeProject/main.cpp