Merge remote-tracking branch 'origin/master'

SS"

This reverts commit be565d9a94d7af986bdbceb23dc6d6080a19ca88.
Revert "Better formatting, added headers for CSS"

This reverts commit be565d9a94d7af986bdbceb23dc6d6080a19ca88.