clase scanner modificada
cambios entrega 1
Merge branch 'master' of https://github.com/jrlveliz/compiladores

Conflicts:
	scanner/DecafLexer.class
	scanner/DecafLexer.java
	scanner/DecafLexer.tokens
	scanner/Scanner.class
	scanner/Scanner.java