Merge pull request #4 from h2r/MoreActions

More actions
Merge branch 'master' into Knowledgebase

Conflicts:
	src/edu/brown/cs/h2r/baking/Experiments/BasicKitchen.java
	src/edu/brown/cs/h2r/baking/IngredientRecipe.java
	src/edu/brown/cs/h2r/baking/ObjectFactories/IngredientFactory.java
	src/edu/brown/cs/h2r/baking/Recipes/MashedPotatoes.java
	src/edu/brown/cs/h2r/baking/actions/MixAction.java
	src/edu/brown/cs/h2r/baking/actions/TurnOnOffAction.java
Merge branch 'Knowledgebase'
Fixing Merge

Fixed issues when merging Knowledgebase and Master branch. Added the
correct burlap jar.
fixing merge