changing stuff
Merge branch 'part2' of https://github.com/xrabohrok/CBC_Proj4 into part2

Conflicts:
	robo4.c