modified:   sample/Archer.java
	modified:   sample/GamePanel.java
	modified:   sample/Mage.java
	new file:   sample/Manifest.txt
	deleted:    sample/Shielded.java
Merge branch 'master' of https://github.com/JoeyTheAsian/pd3-Stuyrim-JoeyTong-JackyLo

Conflicts:
	sample/GamePanel.java

	modified:   README.md
	modified:   sample/GamePanel.java
	new file:   sample/MapObject.java
	new file:   sample/Rock.java