branch test
and simple
& simple
conflict fixed
add merge
merge with no-ff
branch wgc
change by branch Tom
brach Petter
merge with Petter
fix bug 101
merged bug fix 101