conf
Merge branch 'master' of https://github.com/radk0s/Hexapod

Conflicts:
	servo_controller/servo_controller.ino