Merge pull request #160 from shutter111/master

fixed conflicts
added jcw intro images and adjusted color array