changes
Merge branch 'master' of https://github.com/m241dan/DavEngine
Merge branch 'master' of https://github.com/m241dan/DavEngine
Merge branch 'master' of https://github.com/m241dan/DavEngine
Merge branch 'master' of https://github.com/m241dan/DavEngine
Merge branch 'master' of https://github.com/m241dan/DavEngine
added strings.h
fixed conflicts