Modificacion user1
Merge branch 'master' of https://github.com/LennyCast/clermontech-workshop-1

Conflicts:
	readme