modified:   sample/Bug.java
	modified:   sample/Character.java
	modified:   sample/GamePanel.java
	new file:   sample/Shielded.java
	modified:   sample/Swordsman.java
	modified:   sample/sprites/rock.png
	new file:   sample/sprites/swordsman shield down.png
	new file:   sample/sprites/swordsman shield up.png
Merge branch 'master' of https://github.com/JoeyTheAsian/pd3-Stuyrim-JoeyTong-JackyLo

Conflicts:
	sample/Bug.java
	sample/Character.java
	sample/GamePanel.java

	modified:   sample/Bug.java
	modified:   sample/Character.java
	modified:   sample/GamePanel.java
	modified:   sample/Item.java
	modified:   sample/PartyPanel.java
	new file:   sample/items/Cake.png