correct some error
Merge https://github.com/Mikelao9374/ProjectOne

Conflicts:
	ProjectOne.cpp