AND simple2
& simple2
conflict fixed2
fix bug 101
merged bug fix 101
add file4 and file5
Merge branch 'dev3'