this changed?
Merge remote-tracking branch 'Ryan_Hammett/master'
blocked .gwt-log
went back to gwt-log
Merge remote-tracking branch 'Ryan_Hammett/master'

Conflicts:
	RPG/.gwt/.gwt-log
	RPG/src/com/jreale4/RPG/client/BattleView.java
Merge remote-tracking branch 'Ryan_Hammett/master'

Conflicts:
	RPG/src/com/jreale4/RPG/client/BattleView.java
Merge remote-tracking branch 'jreale4/master'

Conflicts (not merged):
	RPG/src/com/jreale4/RPG/client/BattleView.java