wow
Merge branch 'master' of https://github.com/babunok/crop-on-top

Conflicts:
	.classpath
	.project
	README.md
	doc/intro.md
	project.clj