engine base
Merge branch 'master' of github.com:tobyp/ludum-dare-30

Conflicts:
	.gitignore
	ludum-dare-30.ipr