commit before pull
Merge branch 'master' of https://github.com/kjian279/RISC
added maps to ColorPicker, udpated CanvasWrapper render
Merge branch 'master' of https://github.com/kjian279/RISC