dev branch: add one line 777777
add one line 88888
add one line 9999 in branch master
conflict fixed
add merge 1
merge with no-ff
fix bug 404
merge but fix 404
change readme.txt add one line 99999
change one line, add one line, readme.txt

Conflicts:
	readme.txt