This is a test 1
Commiting un-staged stuff as well
Merge branch 'master', remote-tracking branch 'origin'