Merging
Merge branch 'master' of https://github.com/solace210/test6

Conflicts:
	www/index.html