A bunch of things

Main HTML template, form and validation.
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html