update
Merge branch 'master' of github.com:julierich1211/KenPhilJulie

Conflicts:
	js/nlform.js
	js/yummly.json
	templates/recipeResults.html
change hello to routing is working