Should be trashed by pull
Merge branch 'master' of https://github.com/bouticfactory/go-cloudinary

Conflicts:
	admin.go
	service.go