ignore .lein-repl-history
Merge branch 'master' of https://github.com/delihiros/design-project