Updated scanner.
Merge branch 'master' of https://github.com/craleigh318/CS-152

Conflicts:
	Assignment-5/src/frontend/SchemeScanner.java