Merge branch 'master' of https://github.com/georgekick/aoristic
Merge branch 'master' of https://github.com/georgekick/aoristic