WundergroundJSON.java ?
Merge remote-tracking branch 'upstream/develop' into develop
Bug fixes, files as resource
deleted extra xml/json files
fixing agent comment on human move, some debugs
cleanups
minor debuggings
if(true) for debugging corrected
Continuous gaze commands

renamed sgf.logic to logic
changed resources folder to be a package
play delay reduced a second
fixes
small cleanup
Merge branch 'develop' of http://github.com/mbehrooz/always into mbehrooz_ttt
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	plugins/rummy-plugin/sgf/java/edu/wpi/sgf/resources/Scenario.xml
	plugins/rummy-plugin/sgf/java/edu/wpi/sgf/resources/socialAttributes.json
	plugins/rummy-plugin/srummy/java/edu/wpi/always/srummy/RummyClient.java
	plugins/rummy-plugin/srummy/java/edu/wpi/always/srummy/game/Deck.java
	plugins/rummy-plugin/srummy/java/edu/wpi/always/srummy/game/GameState.java
merge upstream