revert...
Revert "revert..."

This reverts commit 7169b6ce91985b887ac11eca33727a3bd6512967.
some changes
Merge branch 'master' of github.com:hento581/OProject2

Conflicts:
	OProject/Starter.cpp