Jiji.
Merge branch 'm aster' of https://github.com/alvarogirona/BuskaMinakas

Conflicts:
	BuskaMinakas/Taulell.cpp