buggy jumping off point
Merge remote-tracking branch 'origin/chris' into Q

Conflicts:
	main.m
Revised logic---new stopping criteria
Merge branch 'chris' into Jameson
Fixed syntax errors and a couple logical issues.
Merge branch 'Jameson' into chris
Merge branch 'chris' into Q

Conflicts:
	main.m