First commit, best commit
Merge https://github.com/drmugg123/muggengine