Merge branch 'spanish'

# Conflicts:
#	color.txt
#	number.txt
