Added Map for keeping track of interactive objects
Removed unused variables in Player and TileMap
Merge branch 'master' of https://github.com/runeaa/Spillprosjekt

Conflicts:
	src/Player/Player.java