General content typo. Typo in gitignore for the stylesheets folder
Merge remote-tracking branch 'origin/master'