monday night work

changed stuff with color mapper to try and get it working
Merge branch 'master' of https://github.com/bradleysnyder/ECE385-master

Conflicts:
	2048/db/2048.(12).cnf.cdb
	2048/db/2048.(12).cnf.hdb