Added .git to ignored list
Merge remote-tracking branch 'origin/master'