implemented ingredient parser
Merge branch 'master' of https://github.com/maxsnew/337-projects

Conflicts:
	recipes/ingredient.py
	recipes/recipe.py