working version, braucht noch finetuning
Merge branch 'master' of https://github.com/sdp2013/robot

Conflicts:
	main.nxc