Everything has a beginning
Merge branch 'master' of https://github.com/regeirk/atlantis

Conflicts:
	README.md