modified:   lexer.py
	added token_type function to return token type
Merge branch 'master' of https://github.com/gokul-uf/QuickOS

Conflicts:
	lexer.py