new file:   Button1.png
	renamed:    ../stuyrim.png -> stuyrim.png
	new file:   trimmed paper background.png
	new file:   trimmed wood background.png
	modified:   wood background.png
	deleted:    ../success.jpg
Merge branch 'master' of https://github.com/JoeyTheAsian/pd3-Stuyrim-JoeyTong-JackyLo

Conflicts:
	README.md
	sample/GamePanel.java
	sample/InventoryPanel.java

	modified:   ../../README.md
	modified:   ../GamePanel.java
	modified:   ../InventoryPanel.java
	../PartyPanel.java