Tests passing for lexer
Merge branch 'master' of github.com:UCSB-CCS-CS/F13-CS1L
Merge branch 'master' of github.com:UCSB-CCS-CS/F13-CS1L
Merge branch 'master' of github.com:UCSB-CCS-CS/F13-CS1L
merging
Merge branch 'master' of github.com:UCSB-CCS-CS/F13-CS1L

trying to pull