add readme file
Add newline
add newline shit
conflict fixed
delete the last line
merge with no-ff
a bug fixed
Merge branch 'bug'