merge with no-ff
fixed bug-01
merge bug-01
add ignore file
Merge branch 'master' into dev