ignore log file
Merge branch 'develop'