Project reshuffle: fixed lexer. Fixed problem with extraneous newlines.
Fixed conflicts