putting these somewhere

anywhere
Merge branch 'master' of github.com:banderson623/ComS430

Conflicts:
	NavigationSystem/.idea/workspace.xml
	NavigationSystem/out/production/NavigationSystem/FakeDataGenerator.class
	NavigationSystem/out/production/NavigationSystem/GPS.class
	NavigationSystem/out/production/NavigationSystem/Instruction.class
	NavigationSystem/out/production/NavigationSystem/ManeuverGen.class
	NavigationSystem/out/production/NavigationSystem/NavSystem$1.class
	NavigationSystem/out/production/NavigationSystem/NavSystem.class
	NavigationSystem/out/production/NavigationSystem/Position.class
	NavigationSystem/out/production/NavigationSystem/Route.class
	NavigationSystem/out/production/NavigationSystem/RouteCalculator.class
	NavigationSystem/out/production/NavigationSystem/UI$1.class