added new file
nano newfile.html
yes
Merge branch 'v1.1'