Merge branch 'master' of https://github.com/Team24Rocks/cse220_lab3

Conflicts:
	scanner.c
Weird changes