Form updated
Merge branch 'master' of https://github.com/CAH-JeffreyNorder/hackathon

Conflicts:
	server/public/index.html
Merge branch 'master' of https://github.com/CAH-JeffreyNorder/hackathon
Merge branch 'master' of https://github.com/CAH-JeffreyNorder/hackathon