First commit!
Merge branch 'master' of github.com:alex-moon/ariadne