Renamed typo file
Merge branch 'develop'