Edited myinfo file
Merge branch 'develop'
added develop2 file
added newfeature file
develop3.txt
added status file
Merge branch 'newfeature' into develop
Merge branch 'master' into develop