Test Commit 2
Test Commit 2
Merge branch 'master' of
https://github.com/PilleFromTheWorks/Battlecraft.git

Conflicts:
	pilleworks/tutorial/generic/Block/GenericOre.java