dev
Merge branch 'master' of https://github.com/chibill/AdditionalCrafting

Conflicts:
	Thumbs.db