Merged pages into one page
Merge branch 'master' into one-page

Conflicts:
	index.html
		selected remote (master) version
Removed pages whose content is now in index.html