Nouveau minerai et armes
arc modif
Merge branch 'master' of https://github.com/benjaminserguienko/MinecraftTryhard

Conflicts:
	src/tryhard/ItemBlasterRifle.java