Revert "Test!"

This reverts commit 4c2d9fc792aba1e283a4a0c3e67445178ad3b21c.
2
added diablo
2
3
3
3
4
Merge branch 'nov'

Conflicts:
	holadiablo.txt
5