config.xml fix: 126 rpm motor encoder added
Merge branch 'master' into encodersInDegrees
Added B1 encoder into the config
Merge branch 'master' of github.com:trikset/trikRuntime

Conflicts:
	trikControl/config.xml
Merge pull request #53 from dvvrd/master

Added B1 encoder into the config
Merge branch 'encodersInDegrees' of git://github.com/romankurbatov/trikRuntime

Conflicts:
	trikControl/config.xml