initial commit
Merge branch 'master' of https://github.com/arippberger/adriane-and-alec