Merge branch 'dev' of https://github.com/overcomer/scalagit
test
Merge branch 'dev', remote-tracking branch 'origin' into dev