remote develop edit
foo1 modify testfile
remote update to dev 1
foo2 modify testfile
Merge branch 'feature/foo2' into develop

* feature/foo2:
  foo2 modify testfile
foo2foo2 modify testfile
remote dev
Merge branch 'feature/foo2' into develop

* feature/foo2:
  foo2foo2 modify testfile
bumping version to 0.1.1
release 011 commit
Merge branch 'release/0.1.1'

* release/0.1.1:
  release 011 commit
  bumping version to 0.1.1
  remote dev
  foo2foo2 modify testfile
  foo2 modify testfile
  remote update to dev 1
  foo1 modify testfile
  remote develop edit

Conflicts:
	README