Feature developed
Cleaning features
Last revision
Added last feature
Merge branch 'refs/heads/develop-stuf' into develop
Developing a new feature
Working on feature A
Working on feature B
Merge branch 'refs/heads/develop-stuf' into develop
Merge branch 'refs/heads/develop-newstuf' into develop
Bug
Merge branch 'refs/heads/develop-newstuf' into develop
Revision of stuff
Merge branch 'refs/heads/develop-newstuf' into develop

Conflicts:
	Master.txt
Resolving conflict
Merge branch 'refs/heads/develop-newstuf' into develop

Conflicts:
	Master.txt
Merge branch 'refs/heads/develop'