Push before merge

.
Merge pull request #10 from h2r/master

Pull master into Knowledgebase
Fixed Merge issues

Everything’s working now
Subgoal Beginnings
Depend on MLIRL Burlap branch now

no need for JAR!
Non Ingredient Subgoals

Kitchen now has a (inelegant) high-level planner that plans through
ingredient subgoals and non-ingredient subgoals alike,  such as those
involving the switch and grease actions. Only implemented for the
Brownies recipe thus far.
Recipe Subgoals

Planner now plans through all recipes with the new subgoal structure
Bake Action Implemented

:)!
No more Bake/Melt Action

The Bake and Melt action were subsumed into both the move and switch
action (switch+move/ move+switch into oven = bake, and same for melt
except for stove).

Also updated test suite and added more tests for the switch and move
action.
safety
Fixed small moveAction bug!
Merge branch 'Knowledgebase' into moveAction

Conflicts:
	src/edu/brown/cs/h2r/baking/actions/MoveAction.java
Merge pull request #11 from h2r/moveAction

Move action & Peel Action
Merge branch 'Knowledgebase' of https://github.com/h2r/baking into moveAction

Conflicts:
	src/edu/brown/cs/h2r/baking/ObjectFactories/SpaceFactory.java
	src/edu/brown/cs/h2r/baking/actions/MoveAction.java
Merge branch 'moveAction' into Knowledgebase
Merge pull request #18 from h2r/master

Merging small bug fixes into knowledgebase
Move action test
move action bug
move action stuff
I'm not sure