added farshad.py to the add_farshad branch. this file prints a farshad string
added the fix.txt to the master branch and added text in the hi.py to specify it has changed in master branch
Merge branch 'master' into add_farshad