modified:   sample/GamePanel.java
	modified:   sample/PartyPanel.java
	new file:   sample/Archer.java
	new file:   sample/GUI images/Loading.png
	modified:   sample/Game.java
	modified:   sample/GamePanel.java
	new file:   sample/Mage.java
	modified:   sample/PartyPanel.java
	modified:   sample/Swordsman.java
Merge branch 'master' of https://github.com/JoeyTheAsian/pd3-Stuyrim-JoeyTong-JackyLo

Conflicts:
	sample/GamePanel.java

modified:   sample/Character.java
	modified:   sample/GamePanel.java
	modified:   units/player/Archer.java
	modified:   units/player/Mage.java
	modified:   units/player/Swordsman.java
Merge branch 'master' of https://github.com/JoeyTheAsian/pd3-Stuyrim-JoeyTong-JackyLo

Conflicts:
	sample/GamePanel.java

	modified:   sample/Character.java
	new file:   sample/Ellipse-Line Intersection.png
	modified:   sample/GamePanel.java
	new file:   units/monster/volcano-3/Moran.java