Sync, AGAIN.
Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPG/.settings/com.google.appengine.eclipse.core.prefs
	RPG/war/WEB-INF/lib/appengine-api-labs.jar
	RPG/war/WEB-INF/lib/appengine-endpoints-deps.jar
	RPG/war/WEB-INF/lib/appengine-endpoints.jar
Merge remote-tracking branch 'jreale4/master'
Compacted equipment.
Updated indentation for cleaner code.
Synced from jreale4's updates.
Updated comment for Powers in Attack class.
Updated comment for Powers in Attack class.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPGModelClasses/src/com/jreale4/RPG/shared/Enemy.java
	RPGModelClasses/src/com/jreale4/RPG/shared/Move.java
	RPGModelClasses/src/com/jreale4/RPG/shared/MoveType.java
	RPGModelClassesTest/junit/com/jreale4/RPG/shared/AttackTest.java
	RPGModelClassesTest/junit/com/jreale4/RPG/shared/HeroTest.java
Sync? Maybe?
Deleted odd HTML file.
Updated coverage of Hero and Item tests.
Increased coverage of tests for Attack, Hero, and Item.

Suggest testing more traits of the Character class under the HeroTest.
Merge remote-tracking branch 'Ryan_Hammett/master'

Conflicts:
	RPGModelClassesTest/junit/com/jreale4/RPG/shared/EnemyTest.java