nothing really
Merge branch 'craft_function' of github.com:theguruofreason/CraftRL into origin-craft_function

Conflicts:
	Item.hs