Okay it should maybe work this time
Trying again
10:47 am 11/22
Conflicts:
	ConsoleApplication4/HandleFlags.cpp
	ConsoleApplication4/HandleVariables.h
	ConsoleApplication4/MainGUIForm.h
	ConsoleApplication4/RunTracking.cpp
	ConsoleApplication4/RunTracking.h
	ConsoleApplication4/Tracking.cpp