before/after pics
Merge branch 'master' of github.com:jaz303/ColorScope.js

Conflicts:
	README.mdown