Control
Merge branch 'master' of https://github.com/nilsberglund/RoboLink

Conflicts:
	Control-module/Control-module.atsuo