edited recipe class; parses ingredients and outputs in json format
Merge branch 'master' of https://github.com/maxsnew/337-projects

Conflicts:
	recipes/ingredient.py