Added a new file to dev branch
Made changes to master
Merged master and dev