readme.txt modified on dev branch
And simple
& simple
conflict fixed
readme.txt modified again
add merge
merge with no-ff
fix bug 101
merged fixed bug 101
new files added
happy.txt modified
merge dev