error line numbers in
Merge branch 'master' of https://github.com/zaaras/CSC467

Conflicts:
	Starter3/Starter3/semantic.c