Merge branch 'develop' into feature/merge_on_finish
Started worked for issue #10 & #11
fix for issue #10 and #11
Merge remote-tracking branch 'origin/feature/merge_on_finish' into develop
small cleanup
removed gitflow.iml, this was an idea project file and not part of the sources
Merge branch 'feature/merge_on_finish' into develop