Initial commit
Merge branch 'master' of github.com:hoyes/symfony2-image-manager

Conflicts:
	.gitignore