Scanner
Merge branch 'master' of https://github.com/person594/cs153

Conflicts:
	assignment6/in.c
	assignment6/small_c.jj