Update 1.md
Merge pull request #158 from FranciscoPorcel/patch-1

Update 1.md
Merge branch 'master' of github.com:JJ/GII-2014

Conflicts:
	practicas/1.md