qaz
Merge branch 'master' of https://github.com/dcaspar/clouddata

Conflicts:
	index.html
koo