ignore .project
edit gitignore
ignore pom
ignore target
Merge branch 'master' of https://github.com/mikera/trellis

Conflicts:
	.gitignore
ignore lein file
add project.clj