Cambios al vimrc
Merge branch 'master' of https://github.com/diegoxter/backups

Conflicts:
	gvbam/gba-castlevaniaaria_www.emugamesworld.com_.sav