readme
Merge branch 'master' of github.com:antoniopuero/uwc

Conflicts:
	README.md
Merge branch 'master' of github.com:antoniopuero/uwc