Adding file-2
Adding more info to file 2 for feature 2
Adding more info to file 2 for feature 1
Merge branch 'feature-1' of github.com:erikryverling/git-lab into feature-1
Merge branch 'feature-1'