Updating
fixing
fixing bugs
Fixing bugs
Merge branch 'master' of https://github.com/chibill/AdditionalCrafting

Conflicts:
	.gitignore

s