Changes.
Merge branch 'master' of https://github.com/tm1990/MiscItemsAndBlocsk-for-Minecraft-1.7

Conflicts:
	java/com/miscitems/MiscItemsAndBlocks/Main/Main.java