edit .gitignore to avoid committing log file
Merge branch 'develop'