Rotary

klar rotary
Merge branch 'master' of https://github.com/LIU-Robotprojekt-2014/RobotOS

Conflicts:
	main.c