issue101 fixed
merged bug fix 101
hhe
bug fixed
new feature added
new feature added master
Update test.txt
merged dev