added some functionality
Merge branch 'master' of https://github.com/alphagosu/410

Conflicts:
	test_language/lexer.rb