Merge the two trackgoal files
	modified:   brain/src/behavior/sktrackgoal/sktrackgoal_1.py
	modified:   brain/src/behavior/sktrackgoal/sktrackgoal_2.py
Fiddle around with trackball
Merge branch 'master' of https://github.com/Wobbo/PAS-Sokkers

Conflicts:
	sudo/brain/src/behavior/skattacker/skattacker_1.py

	modified:   brain/src/behavior/skaligngoal/skaligngoal_0.py
	modified:   brain/src/behavior/skattacker/skattacker_1.py
	modified:   brain/src/behavior/sklookforgoal/sklookforgoal_1.py
	modified:   brain/src/behavior/skshoot/skshoot_1.py
	renamed:    brain/src/behavior/skshoot/skshoot_0.py -> brain/src/behavior/skshoot/skshoot_2.py
	modified:   brain/src/behavior/sktrackgoal/sktrackgoal_1.py
	modified:   brain/src/behavior/sktrackgoal/sktrackgoal_2.py
	new file:   brain/src/kindof.sh