Trying to make files sync with Github
Merge remote-tracking branch 'origin/master'