[prova] bnf
Merge branch 'master' of https://github.com/Walderi/compz-equipe-01-2013-1