Edited myinfo file
Merge branch 'develop'
Added develop2 file
Added newfeature file
Added develop3 file
Added status file
Merge branch 'newfeature' into develop