Add color parsing
Merge branch 'master' of github.com:Javafant/pytracer