removed extra file
Merge branch 'develop'