whitespace
added git autocomplete
added git branchname to bash prompt
finished feature
Merge branch 'feature/test-feature' into develop
cleanup
Merge branch 'release/0.0.1'