modified:   roguelike_game/nbproject/project.properties
	renamed:    roguelike_game/src/roguelike_game/Painting.java -> roguelike_game/src/roguelike_game/Game.java
	modified:   roguelike_game/src/roguelike_game/InventoryPanel.java
	modified:   roguelike_game/src/roguelike_game/MenuScreen.java
	deleted:    roguelike_game/src/roguelike_game/Roguelike_game.java
	modified:   roguelike_game/src/roguelike_game/TileMap.java
	modified:   roguelike_game/src/roguelike_game/entity/Player.java
	modified:   roguelike_game/src/roguelike_game/events/ItemPickupListener.java
	modified:   roguelike_game/src/roguelike_game/events/ItemPopupMenu.java
	modified:   roguelike_game/src/roguelike_game/events/Movement.java
	new file:   roguelike_game/src/roguelike_game/graphics/Render.java
	modified:   roguelike_game/src/roguelike_game/graphics/Sprite.java
	modified:   roguelike_game/src/roguelike_game/graphics/SpriteSheet.java
	new file:   roguelike_game/src/roguelike_game/transport/Inventory.java
reorganized system and fixed detached head
Merge branch 'master' of https://github.com/Open-Horizons/roguelike-game-development