Merge branch 'master' of github.com:the42/ogdat

Conflicts:
	.gitignore