Initial commit
Trying to get github to work
Merge branch 'master' of https://github.com/GameDevGuru/OpenEngine
fixed conflicts