Made changes to feature 1
More Feature 1 changes
Made changes to feature 1
More Feature 1 changes
Add changes after rebase
Fix mergeconflict after rebase
Add function
Merge branch 'master' of github.com:hanskhe/Hellogit