yummly
watMerge branch 'master' of https://github.com/julierich1211/KenPhilJulie

Conflicts:
	js/app.js
pull Merge branch 'master' of https://github.com/julierich1211/KenPhilJulie
pullMerge branch 'master' of https://github.com/julierich1211/KenPhilJulie

Conflicts:
	js/app.js
insert