changes ignoretest D:\filip\programmering\minecraft\workspace\1.7.10\alchemancy
Merge branch 'master' of https://github.com/Afisse13/Alchemancy

Conflicts:
	.gitignore