Some changes
Merge branch 'master' of https://github.com/slc-cs-summer-research/tiny-schemer

Conflicts:
	tiny-schemer/src/parser/Token.java
Lexer 1st pass complete
Merge branch 'master' of https://github.com/slc-cs-summer-research/tiny-schemer