a
Merge branch 'master' of https://github.com/alvarogirona/BuskaMinakas

Conflicts:
	BuskaMinakas/Taulell.cpp
Merge branch 'master' of https://github.com/alvarogirona/BuskaMinakas

Conflicts:
	BuskaMinakas/Taulell.cpp