Syncing files

Conflicts:
	CrossReference
	Scanner.o
	main.cpp
	main.o
Syncing
main.o worn out