add simple
&  simple
conflict fixed
 change test by dev
merge wich no-ff
fixed bug 101
 fied bug 101.1
Merge branch 'issue-101'
 add dev env
fixed conflicts dev
Merge branch 'master' into dev

Conflicts:
	test
Merge branch 'dev' into master
add master file
merge master into dev
fix bug2
change test/ add dev file
merge dev to master
 add feature.py
the new task feature into dev
Merge branch 'dev'