small changes to the guide
fixing josés annotations
Merge branch 'first_changes' of github.com:miguelperez/guides into miguelperez-first_changes

Conflicts:
	best-practices/README.md