Stop and reset timeouts.
Update gitignore.
Merge branch 'master_original'

Conflicts:
	.gitignore
	roboclaw-driver/src/RoboclawController.cpp