testing travis ci
Merge branch 'master' of https://github.com/stephenjohnston/clj-sked