Whoops, made a few mistakes while resolving conflicts. Colors should load again.
	modified:   sudo/brain/data/colorblob_new/Colors
	modified:   sudo/brain/src/behavior/sktrackball/sktrackball_1.py
	modified:   sudo/brain/src/config/behaviors_config
- Add calibration behavior
- Add a file with all the colors in it

	new file:   sudo/bain/data/colorblob_new/Colors_master
	new file:   sudo/brain/src/behavior/skblock/__init__.py
	new file:   sudo/brain/src/behavior/skblock/skblock.py
	new file:   sudo/brain/src/behavior/skblock/skblock_1.py
	new file:   sudo/brain/src/behavior/skblock/skblock_x.py
	new file:   sudo/brain/src/behavior/skcalibrate/__init__.py
	new file:   sudo/brain/src/behavior/skcalibrate/skcalibrate.py
	new file:   sudo/brain/src/behavior/skcalibrate/skcalibrate_1.py
	new file:   sudo/brain/src/behavior/skcalibrate/skcalibrate_x.py
	new file:   sudo/brain/src/config/sk_calibrate