Final modifications
Merge branch 'master' of github.com:soykyke/LEGOTHIEFPROJECT

Conflicts:
	ROBOT Application/Controller.nxd
	ROBOT Application/Controller.nxj