Questão2_Versão_final
Merge branch 'master' of https://github.com/paulob/compz-equipe-02-2013-1
Merge branch 'master' of https://github.com/paulob/compz-equipe-02-2013-1