phil
mergeMerge branch 'master' of github.com:julierich1211/KenPhilJulie

Conflicts:
	index.html
	js/app.js
	templates/formbegin.html
commitMerge branch 'master' of github.com:julierich1211/KenPhilJulie

Conflicts:
	js/app.js
	templates/formbegin.html
yummly