Superimportant bugfix to master
Made changes to feature 1
More Feature 1 changes
Add changes after rebase
Fix mergeconflict after rebase