first commit
Merge branch 'master' of https://github.com/xgfd/web-observatory

Conflicts:
	README.md
Merge branch 'master' of https://github.com/xgfd/web-observatory