a
Merge branch 'master' of https://github.com/bspkrs/StartingInventory

Conflicts:
	src/net/minecraft/src/mod_StartingInventory.java