fix number 2
adding the help file
Merge branches 'my_testing' and 'master'