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
Update app.js

just removing merge conflicts
Update app2.js

fixing merge conflicts
Update index.html

fixing merge conflicts
Update formBegin.html

fixing conflicts
Delete formbegin.html

fixing merge conflicts
Rename formmiddle.html to formMiddle.html

fixing merge conflicts
Merge branch 'master' of github.com:julierich1211/KenPhilJulie

Conflicts:
	js/app.js
newestattempt