Merge pull request #28 from h2r/master

Pulling from master
Merge pull request #31 from h2r/master

Resource folder
Fixes prior to merge with Master
Merge pull request #32 from h2r/Knowledgebase

Full planning integration into master
Merge branch 'useAction'

Conflicts:
	src/edu/brown/cs/h2r/baking/IngredientRecipe.java
	src/edu/brown/cs/h2r/baking/Knowledgebase/IngredientKnowledgebase.java
	src/edu/brown/cs/h2r/baking/ObjectFactories/IngredientFactory.java
	src/edu/brown/cs/h2r/baking/actions/MixAction.java
Merge branch 'master' into useAction