deleted:    images/artwork/1.txt
	deleted:    images/sprites/1.txt
	deleted:    images/textures/1.txt
	modified:   sample/Character.java
	modified:   sample/GamePanel.java
	modified:   sample/sprites/swordsman left animated.gif
Merge branch 'master' of https://github.com/JoeyTheAsian/pd3-Stuyrim-JoeyTong-JackyLo

Conflicts:
	sample/GamePanel.java

	modified:   sample/GamePanel.java
	modified:   sample/PartyPanel.java
	modified:   sample/Player.java
	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