Merge branch 'master' of https://github.com/gearlles/nemesis.git
Merge branch 'master' of https://github.com/gearlles/nemesis.git

Conflicts:
	nemesis/src/main/java/br/poli/ecomp/nemesis/avaliador/parser.java
	nemesis/src/main/jflex/avaliador/ALexico.java~
	nemesis/src/parser.java