First Update, is incomplete but will compile.

Signed-off-by: Mike Howe <mike@mcsnetworks.com>
Merge branch 'master' of https://github.com/AlmuraDev/Mo-Ore-s

Conflicts:
	src/com/github/Zarklord1/MoOres/Custom/Items/Tools/CustomAxes.java
	src/com/github/Zarklord1/MoOres/Custom/Items/Tools/CustomBows.java