AND simple
& simple
fixed confilct
add merge.
merge with no-f
fixed bug 101
merged bug fix 101
add folder --folder1
Merge branch 'dev'