GUI and string.xml updated
GUI add_ingredients and string.xml
Add ingredients done
Merge pull request #14 from CMPUT301W13T04/master

Pull Cache
add ingredients updated.
Merge branch 'master' into AddIngredients

Conflicts:
	res/layout/activity_main.xml
Merge pull request #17 from CMPUT301W13T04/AddIngredients

Merge Add Ingredients Activity