branch test
nn
AND simple
& simple
conflit fixed
move files to directory
remove files LICENSE and readme.txt
add merge
merge with no-ff
fix bug 101
merged bug fix 101