branch test
AND simple
& simple
comflict fixed
dev working...
fix bug 101
merged bug fix 101
dev complte
dev merge to master