revertendo
Merge branch 'master' of https://github.com/miguel747/Projeto_POO

Conflicts:
	Damas/Damas.pro.user.1.3
	Damas/Damas.pro.user.c6ee488
	Damas/casaTeste/casaTeste.pro.user~562adde0a666d6d564b531fc3a42fdcb94b11d14
	Damas/casaTeste/casaTeste.pro.user~HEAD