added .properties .json to colors
Merge branch 'master' of github.com:larrybreyer/etc