changed default git editor to nano
Merge branch 'develop'