old
old2
Merge branch 'master' of https://github.com/corley/cloud-conf.git

Conflicts:
	index.html
	styles.css