Correction of .gitignore and color
Merge branch 'develop'