Commit inicial de la repo
Merge branch 'master' of https://github.com/epierotto/oso

Conflicts:
	LICENSE
	README.md