select type, color schemes
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/models/options.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/main.js
	js/models/options.js
added colors to color library