[LISTA 2] - Fixing LEX and Makefile
Merge branch 'master' of github.com:Walderi/compz-equipe-01-2013-1

updating george's master branch