Started to write structure of web page
Merge branch 'master' into alan

Conflicts:
	index.html