add info
merge and new commit
modify bug on issus-101 branch
merge issus-101 info
modify info on dev
agin
merge to dev