Merge branch 'master' into develop
Merge branch 'develop'
updated .gitignore
color change
Merge branch 'develop' of https://github.com/techguytom/local-dev into develop
Merge branch 'master' into develop