Nothing good.
Merge remote-tracking branch 'jreale4/master'
Cleaned up HeroTest.
Cleaned up GUI code.
Last stable commit.
Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPG/.classpath
	RPG/.gwt/.gwt-log
	RPG/src/com/jreale4/RPG/client/RPG.java
	RPG/war/RPG.html
	
Attepmted fix of merge, RPG >> src folder may have broken.
Fixed possible errors shown via Eclipse.
Fixed .classpath error.
Less warnings.
Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPG/src/com/jreale4/RPG/client/LoginView.java
	RPGModelClasses/src/com/jreale4/RPG/shared/User.java
Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPG/src/com/jreale4/RPG/client/LoginView.java
	RPGModelClasses/src/com/jreale4/RPG/shared/User.java
Error in Login View (still).
Working Login View.

Merge remote-tracking branch 'jreale4/master'

Conflicts:
	RPG/src/com/jreale4/RPG/client/LoginView.java
Fully Merged Commit 4/11 4:38