modified:   items/Armour.java
	modified:   items/Item.java
	modified:   items/Weapon.java
	deleted:    GUI/GUI.java
	deleted:    GUI/GUI.java~
Merge branch 'master' of https://github.com/JoeyTheAsian/pd3-Stuyrim-JoeyTong-JackyLo
Merge branches 'master', 'master' and 'master' of https://github.com/JoeyTheAsian/pd3-Stuyrim-JoeyTong-JackyLo
	deleted:    GUI/GUI.java
	deleted:    GUI/GUI.java~
	modified:   maps/Door.java
	new file:   maps/Driver.java
	modified:   maps/Obstacle.java
	modified:   maps/mapObject.java
Merge branch 'master' of https://github.com/JoeyTheAsian/pd3-Stuyrim-JoeyTong-JackyLo

Conflicts:
	items/Weapon.java
	sample/Game.java
	sample/Utilities.java