new file:   maps/Driver.java
	modified:   maps/Obstacle.java
	new file:   maps/map/Player.png
	modified:   maps/mapObject.java
	new file:   maps/paint.java
Merge branch 'master' of https://github.com/JoeyTheAsian/pd3-Stuyrim-JoeyTong-JackyLo

Conflicts:
	maps/Driver.java
	maps/Obstacle.java
	maps/Obstacle.java~
	maps/mapObject.java

	deleted:    items/Consumables.java~
	modified:   items/Item.java
	modified:   items/Weapon.java
	modified:   maps/Door.java
	modified:   maps/Door.java~
	modified:   maps/Driver.java
	modified:   maps/Obstacle.java
	modified:   maps/Obstacle.java~
	modified:   maps/mapObject.java
	modified:   maps/mapObject.java~
	deleted:    maps/mapOject.java~
	deleted:    units/Monster.java
	renamed:    units/Bird.java -> units/monster/FLOOR1/Bird.java
	renamed:    units/Goblin.java -> units/monster/FLOOR1/Goblin.java
	renamed:    units/Plant.java -> units/monster/FLOOR1/Plant.java
	renamed:    units/Slime.java -> units/monster/FLOOR1/Slime.java
	new file:   units/monster/Monster.java
	new file:   units/player/Archer.java
	new file:   units/player/Mage.java
	new file:   units/player/Player.java
	new file:   units/player/Swordsman.java