Spanish
Merge branch 'master' of https://github.com/samuelneff/github-play

Conflicts:
	Test.txt