Tipos escalares
uno commits
añado gitignore
Merge commit '39bff826a43f3d5d690ac3b9c7c29e6092070668'

Conflicts:
	.gitignore