Add more page content
Merge branch 'master' into changes

Conflicts:
	index.html
Merge branch 'changes'