I added my nombre

Accept this you Mother F****r!
Merge pull request #1 from aaron713/master

I added my nombre
I added something

Add it! ASAP!
This is my new file

Add my new file
Merge pull request #8 from aaron713/master

I have changes
Adding diegofile.txt to the repo and adding diegomanri's changes to the readme file.
Just trying to sync my forked version from the remote repo at diegomanri2
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md