Change
Merge remote-tracking branch 'origin/Tim' into Will

Conflicts:
	NewFile_Template001.c
added stuff

I added stuff for pre-autonomous, autonomous, user control, and sensor
descriptions.
change?