Initial commit try 2
I'm still figuring out how to use git
Merge branch 'master' of https://github.com/drowdemon/TestGameEngine

Conflicts:
	.gitignore