changed index-insert.php
updated index-output.php
updated index.html
updated info.html
Merge branch 'form' of github.com:demmys/aloha into form

Conflicts:
	form/index-insert.php
	form/index-output.php
updated index.html
Merge branch 'form' of github.com:demmys/aloha into form

Conflicts:
	form/index.html
updated index.html
updated form/index.html
Merge branch 'form' of github.com:demmys/aloha into form

Conflicts:
	form/index.html
updated form/index.html