deleted:    items/Armour.java
	deleted:    items/Consumables.java
	deleted:    items/Inventory.java
	deleted:    items/Item.java
	deleted:    items/ItemSort.java
	deleted:    items/Weapon.java
	deleted:    maps/Breakable.java
	deleted:    maps/Door.java
	deleted:    maps/Driver.java
	deleted:    maps/Level.java
	deleted:    maps/Map.java
	deleted:    maps/Obstacle.java
	deleted:    maps/Tile.java
	deleted:    maps/map/Player.png
	deleted:    maps/mapObject.java
	deleted:    maps/paint.java
	modified:   sample/GUI images/stuyrim.png
	modified:   sample/GamePanel.java
	deleted:    units/Unit.java
	deleted:    units/monster/Monster.java
	deleted:    units/monster/grassyPlains-1/Bird.java
	deleted:    units/monster/grassyPlains-1/Bird.png
	deleted:    units/monster/grassyPlains-1/Goblin.java
	deleted:    units/monster/grassyPlains-1/Goblin.png
	deleted:    units/monster/grassyPlains-1/Jareth.java
	deleted:    units/monster/grassyPlains-1/Jareth.png
	deleted:    units/monster/grassyPlains-1/Ram.java
	deleted:    units/monster/grassyPlains-1/Ram.png
	deleted:    units/monster/grassyPlains-1/Slime.java
	deleted:    units/monster/grassyPlains-1/Slime.png
	deleted:    units/monster/grassyPlains-1/Wyvern.java
	deleted:    units/monster/grassyPlains-1/Wyvern.png
	deleted:    units/monster/grassyPlains-1/sampleGUI/Driver.java
	deleted:    units/monster/grassyPlains-1/sampleGUI/Picture.java
	deleted:    units/monster/mountains-2/Alduin.java
	deleted:    units/monster/mountains-2/Alduin.png
	deleted:    units/monster/mountains-2/Dwarf.java
	deleted:    units/monster/mountains-2/Dwarf.png
	deleted:    units/monster/mountains-2/Gargoyle.java
	deleted:    units/monster/mountains-2/Gargoyle.png
	deleted:    units/monster/mountains-2/Giant.java
	deleted:    units/monster/mountains-2/Giant.png
	deleted:    units/monster/mountains-2/Golem.java
	deleted:    units/monster/mountains-2/Golem.png
	deleted:    units/monster/mountains-2/Silverfish.java
	deleted:    units/monster/mountains-2/Silverfish.png
	deleted:    units/monster/readme
Merge branch 'master' of https://github.com/JoeyTheAsian/pd3-Stuyrim-JoeyTong-JackyLo

Conflicts:
	sample/GamePanel.java
	new file:   sample/Bug.java
	new file:   sample/Driver.java
	new file:   sample/GUI images/Button.png
	new file:   sample/GUI images/Button1.png
	new file:   sample/GUI images/Loading.png
	new file:   sample/GUI images/flickerStop.png
	new file:   sample/GUI images/stuyrim.png
	new file:   sample/GUI images/trimmed paper background long.png
	new file:   sample/GUI images/trimmed paper background.png
	new file:   sample/GUI images/trimmed wood background.png
	new file:   sample/GUI images/wood background.png
	new file:   sample/Game.java
	new file:   sample/Manifest.txt
	new file:   sample/MapObject.java
	new file:   sample/MenuPanel.java
	new file:   sample/PartyPanel.java
	new file:   sample/Player.java
	new file:   sample/Rock.java
	new file:   sample/Tile.java
	new file:   sample/Utilities.java
	new file:   sample/items/Cake.png
	new file:   sample/sprites/bird down animated.gif
	new file:   sample/sprites/bird down.png
	new file:   sample/sprites/bird left animated.gif
	new file:   sample/sprites/bird left.png
	new file:   sample/sprites/bird right animated.gif
	new file:   sample/sprites/bird right.png
	new file:   sample/sprites/bird up animated.gif
	new file:   sample/sprites/bird up.png
	new file:   sample/sprites/bug down animated.gif
	new file:   sample/sprites/bug down.png
	new file:   sample/sprites/bug left animated.gif
	new file:   sample/sprites/bug left.png
	new file:   sample/sprites/bug right animated.gif
	new file:   sample/sprites/bug right.png
	new file:   sample/sprites/bug up animated.gif
	new file:   sample/sprites/bug up.png
	new file:   sample/sprites/bush.png
	new file:   sample/sprites/campfire.png
	new file:   sample/sprites/dirt.png
	new file:   sample/sprites/goblin down animated.gif
	new file:   sample/sprites/goblin down.png
	new file:   sample/sprites/goblin left animated.gif
	new file:   sample/sprites/goblin left.png
	new file:   sample/sprites/goblin right animated.gif
	new file:   sample/sprites/goblin right.png
	new file:   sample/sprites/goblin up animated.gif
	new file:   sample/sprites/goblin up.png
	new file:   sample/sprites/grass.png
	new file:   sample/sprites/mage down animated.gif
	new file:   sample/sprites/mage down.png
	new file:   sample/sprites/mage left animated.gif
	new file:   sample/sprites/mage left.png
	new file:   sample/sprites/mage right animated.gif
	new file:   sample/sprites/mage right.png
	new file:   sample/sprites/mage shield up animated.gif
	new file:   sample/sprites/mage shield up.png
	new file:   sample/sprites/mage up animated.gif
	new file:   sample/sprites/mage up.png
	new file:   sample/sprites/rock.png
	new file:   sample/sprites/slime down animated.gif
	new file:   sample/sprites/slime down.png
	new file:   sample/sprites/slime left animated.gif
	new file:   sample/sprites/slime left.png
	new file:   sample/sprites/slime right animated.gif
	new file:   sample/sprites/slime right.png
	new file:   sample/sprites/slime up animated.gif
	new file:   sample/sprites/slime up.png
	new file:   sample/sprites/swordsman down animated.gif
	new file:   sample/sprites/swordsman down.png
	new file:   sample/sprites/swordsman left animated.gif
	new file:   sample/sprites/swordsman left.png
	new file:   sample/sprites/swordsman right animated.gif
	new file:   sample/sprites/swordsman right.png
	new file:   sample/sprites/swordsman shield down animated.gif
	new file:   sample/sprites/swordsman shield down.png
	new file:   sample/sprites/swordsman shield up animated.gif
	new file:   sample/sprites/swordsman shield up.png
	new file:   sample/sprites/swordsman up animated.gif
	new file:   sample/sprites/swordsman up.png
	new file:   sample/sprites/tree.png
	new file:   sample/sprites/wall.png