fix bug on dev branch
fix bug 8888888
master change for readme
Merge branch 'bugfixing'
add
readme on bug fixing
conflict fixed
add merge
merge with no-ff
fix 404 issue
merge bug fixing 404
fix 404 issue
merge 404 issue