Added some stuff
Added SASS
Merge remote-tracking branch 'origin/master'