Changed coloring
fixed merge conflicts
Merge branch 'master' of https://github.com/ktn/Iter2 into view
Merge pull request #24 from ktn/view

View