.gitignire
Merge branch 'development' of https://github.com/zinroc/zinrocfantasy into development

Conflicts:
	.gitignore