Y que te importa!...
Merge branch 'master' of https://github.com/hermanjunge/cocacola

Conflicts:
	README.md