Basic engine setup
Merge branch 'master' of https://github.com/djonasson/worldwise

Conflicts:
	.gitignore