retrieved working copy
retreats to just whitespace
Merge branch 'teskbranck'

Conflicts:
	lib/lexer.rb
	spec/spec_helper.rb