Staging
Changing gitignore
Testing merge
Merge branch 'dev'