Commit of leiningen generated project
Fixed merge conflicts