modified:   sample/GamePanel.java
Merge branch 'master' of https://github.com/JoeyTheAsian/pd3-Stuyrim-JoeyTong-JackyLo

Conflicts:
	sample/GamePanel.java

	modified:   sample/Bug.java
	modified:   sample/Character.java
	modified:   sample/GamePanel.java
	new file:   sample/Goblin.java
	modified:   sample/Mage.java
	modified:   sample/Swordsman.java
	modified:   sample/sprites/bug down animated.gif
	modified:   sample/sprites/bug down.png
	modified:   sample/sprites/bug left animated.gif
	modified:   sample/sprites/bug left.png
	modified:   sample/sprites/bug right animated.gif
	modified:   sample/sprites/bug right.png
	modified:   sample/sprites/bug up animated.gif
	modified:   sample/sprites/bug up.png
	modified:   sample/sprites/goblin down animated.gif
	modified:   sample/sprites/goblin down.png
	modified:   sample/sprites/goblin up animated.gif
	modified:   sample/sprites/goblin up.png
	modified:   sample/sprites/slime down animated.gif
	modified:   sample/sprites/slime down.png
	modified:   sample/sprites/slime left animated.gif
	modified:   sample/sprites/slime left.png
	modified:   sample/sprites/slime right animated.gif
	modified:   sample/sprites/slime right.png
	modified:   sample/sprites/slime up animated.gif
	modified:   sample/sprites/slime up.png