adds music discs
Merge remote-tracking branch 'origin/master'

Conflicts:
	block/BlockList.java
	block/BlockPetrifiedWood.java
	block/BlockWarpwood.java
	info/ItemInfo.java
	item/ItemList.java
Merge branch 'master' of https://github.com/fingersome/lostarcana

Conflicts:
	block/BlockList.java
	block/BlockPetrifiedWood.java
	block/BlockWarpwood.java
	info/ItemInfo.java
	item/ItemList.java