modified:   items/Weapon.java
modified:   maps/Breakable.java
	new file:   maps/Map.java
Merge branch 'master' of https://github.com/JoeyTheAsian/pd3-Stuyrim-JoeyTong-JackyLo
Merge branch 'master' of https://github.com/JoeyTheAsian/pd3-Stuyrim-JoeyTong-JackyLo

Conflicts:
	sample/Utilities.java

	new file:   images/artwork/1.txt
	new file:   images/sprites/1.txt
	new file:   images/textures/1.txt
	deleted:    monster/Dragon.java
	deleted:    monster/Dragon.java~
	deleted:    monster/Golem.java
	deleted:    monster/Golem.java~