Sending quotes to file
Merge branch 'master' of github.com:FeltTip/FeltTip

Conflicts:
	form.html