initial commit
Merge branch 'master' of https://github.com/rfanjul/cargomedia

Conflicts:
	README.md