trying to fix item stacks
Merge branch 'master' of https://github.com/STFinancial/Minecraft
Merge branch 'master' of https://github.com/STFinancial/Minecraft
forfeit
Merge branch 'master' of https://github.com/STFinancial/Minecraft

Conflicts:
	STFArena/src/main/ArenaPlayer.java