player inventory
Merge branch 'master' of https://github.com/Aomeas/1GAM1014

Conflicts:
	src/ogam1014/entity/Player.java