Make code compilable and work
Change header name
Merge https://github.com/Mikelao9374/ProjectOne

Conflicts:
	ProjectOne.cpp
Merge pull request #4 from TheKK/master

Make code work