Fixed some small stuff, coded some on the inventory
Merge branch 'dev' of https://github.com/ravertass/KandidatRoguelike into dev

Conflicts:
	se/chalmers/roguelike/Entity.java
Merge branch 'dev' of https://github.com/ravertass/KandidatRoguelike into dev

Conflicts:
	se/chalmers/roguelike/Engine.java