Added Some things
Merge branch 'master' of https://github.com/SoBiohazardous/Modjam4

Conflicts:
	src/main/java/sobiohazardous/mods/ec/item/ItemGems.java