Initial commit
Initial Commit
Initial Commit
initial project setup
Merge branch 'master' of github.com:DanielHeckrath/OCThumbor

Conflicts:
	.gitignore
	LICENSE
	README.md