Initial Commit
Merge branch 'master' of https://github.com/christian-van-deursen/atlas

Conflicts:
	.gitignore