Update 8.7 - Vida

Pontuação also;
Merge branch 'master' of https://github.com/nunovalente/final_rob_nune

Conflicts:
	Craddle_of_DEI/Craddle_of_DEI/bin/paineis/PainelPrincipal.class
	Craddle_of_DEI/Craddle_of_DEI/bin/vista/JanelaJogo$1.class
	Craddle_of_DEI/Craddle_of_DEI/bin/vista/JanelaJogo$2.class
	Craddle_of_DEI/Craddle_of_DEI/bin/vista/JanelaJogo$3.class
	Craddle_of_DEI/Craddle_of_DEI/bin/vista/JanelaJogo$4.class
	Craddle_of_DEI/Craddle_of_DEI/bin/vista/JanelaJogo.class
	Craddle_of_DEI/Craddle_of_DEI/src/paineis/PainelPrincipal.java
	Craddle_of_DEI/Craddle_of_DEI/src/vista/JanelaJogo.java