changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Defenses.java
	RPG.java