Adding more stuff to feature 1
Fixing typo
Merge branch 'feature-1'
Adding stuff directly on master
Adding more stuff direcly on master
Adding even more stuff to Feature 1
Merge branch 'feature-1'