meh
Merge branch 'master' of ssh://git@github.com/agarza6/derivA.git

Conflicts:
	DerivA/build/classes/edu/utep/cybershare/DerivA/AssertionMaker.class
	DerivA/build/classes/edu/utep/cybershare/DerivA/DerivationMaker.class
	DerivA/build/classes/edu/utep/cybershare/DerivA/WorkflowDriver.class
	DerivA/build/classes/edu/utep/cybershare/DerivA/util/CIServerDump.class
	DerivA/build/classes/edu/utep/cybershare/DerivA/util/NodeSetBuilder.class
	DerivA/build/classes/edu/utep/cybershare/DerivAUI/DerivAUI.class
	DerivA/build/classes/edu/utep/cybershare/DerivAUI/components/AgentComboBox.class
	DerivA/build/classes/edu/utep/cybershare/DerivAUI/components/IndividualComboBox$BinaryLookup.class
	DerivA/build/classes/edu/utep/cybershare/DerivAUI/components/InferenceRulesComboBox.class
	DerivA/build/classes/edu/utep/cybershare/DerivAUI/components/PMLJComboBox.class
	DerivA/build/classes/edu/utep/cybershare/DerivAUI/components/PMLJList.class
	DerivA/build/classes/edu/utep/cybershare/DerivAUI/tools/AddAgentTool.class
	DerivA/build/classes/edu/utep/cybershare/DerivAUI/tools/AddFormatTool.class
	DerivA/build/classes/edu/utep/cybershare/DerivAUI/tools/AddSourceTool.class
	DerivA/build/classes/edu/utep/cybershare/DerivAUI/tools/AggregaterTool.class
	DerivA/build/classes/edu/utep/cybershare/DerivAUI/tools/ESIPUploader.class
	DerivA/build/classes/edu/utep/cybershare/DerivAUI/tools/OpenWorkflowTool.class
	DerivA/build/classes/edu/utep/cybershare/DerivAUI/tools/updatePMLP.class
Merge branch 'master' of ssh://git@github.com/agarza6/derivA.git

Conflicts:
	DerivA/build/classes/edu/utep/cybershare/DerivAUI/DerivAUI.class
Merge branch 'master' of ssh://git@github.com/agarza6/derivA.git
Updated Version w/Local Lib