Initial Structure
Merge branch 'master' of github.com:rricard/dotatom