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

Conflicts:
	Damas-ultimaversao-build-Desktop_Qt_5_0_1_clang_64bit-Debug/Damas-ultimaversao.app/Contents/MacOS/Damas-ultimaversao
	Damas-ultimaversao/tests/casaTeste-build-Desktop_Qt_5_0_1_clang_64bit-Debug/tst_casatestetest
	Damas-ultimaversao/tests/casaTeste/casaTeste.pro.user.c6ee488
	Damas/Damas.pro.user