fixed token.java
Merge branch 'master' of https://github.com/jvlomax/inf-2402.git

Conflicts:
	src/no/uio/ifi/cflat/scanner/Token.java