Allun kamat
Merge remote-tracking branch 'origin/master'

Conflicts:
	Player/inventory.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	Player/inventory.html