Merge branch 'master' into develop
add link to nano tutorial 2
Merge branch 'develop'