Recognize string literals.
Merge branch 'master' of https://github.com/jankdc/occam

Conflicts:
	src/main.cpp
Fixed an idiotic merge.