use 4-color images
Merge branch 'master' into fourcolor
merge from Navid
switch back to tricolor
Merge pull request #4 from escherba/fourcolor

switch to tricolor