Removed file that shouldn't be tracked
commit1
Merge remote-tracking branch 'origin/master'