form commit
Merge branch 'master' of https://github.com/falconette92/TEST

Conflicts:
	form.html
form commit