Added something in the branch
More changes
Started work on iss53
Continuing work, it's hard
Continuing more work
Fixed hotfix
Carrying work after the hotfix interuption
Resolved conflict
Merge branch 'testing'
changing stuff
changing stuff in master
changing stuff in branch
fixed another conflict