primeros pasos
Merge branch 'julian'

Conflicts:
	index.html
sale
Merge branch 'master' of https://github.com/miguelavendano/Junior

Conflicts:
	index.html