Superimportant bugfix to master
Made changes to feature 1
More Feature 1 changes
Add changes after rebase
Fix mergeconflict after rebase
Fix critical error
Add function
Merge branch 'master' of github.com:hanskhe/Hellogit
Feature 2 is so cool
Feature_2 done
Fix mergeconflict