Finished factor coloring
Merge branch 'master' of https://github.com/nosson/healthvis-1