Merge commit
Fixed merge issues
Now fixed merge issues
Truly fixed merge issues
Merge branch 'master' of https://github.com/defiant810/Essencraft

Conflicts:
	src/main/java/com/co2/essencraft/item/ItemCoconut.java