prova merge
Merge branch 'master' of https://github.com/albertmayor/pacman

Conflicts:
	LICENSE
asdasdasd