initial commit
Merge branch 'master' of github.com:miguelbermudez/clj-image-proxy

Conflicts:
	.gitignore
	README.md