Added html-structure to index.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/index.html
Added 404 and some simple parsing
Added 404 and some simple parsing
Merged