Adding newfeature.txt
Merge branch 'newfeature' into dev
Version 2.0
Merge branch '2.0'