some stuff
Merge https://github.com/BHEL2016/BBRobot

Conflicts:
	test.txt