Make a table for settings.
Merge remote-tracking branch 'origin/table'

Conflicts:
	www/secondPage.html