Playing with .gitignore
Merge branch 'master' of github.com:mdesanti/videojuegos

Conflicts:
	.gitignore