editing html file

added button and input boxes to html file
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	manifest.json