not working
hmph
Merge branch 'master' of github.com:julierich1211/KenPhilJulie

Conflicts:
	index.html
	js/app.js
	js/app2.js
	npm-debug.log
	templates/formbegin.html