settings, read, write and colours
Merge branch 'master' of https://github.com/DropbearNinja/HTPConnect

Conflicts:
	htdocs/content/settings.html
	htdocs/index.html
	logs/access.log
	logs/error.log