primeres pases
Merge branch 'master' of http://github.com/julifer14/tallerMecanic

Conflicts:
	.gitignore