major updates
Merge branch 'sassy'
new css
Merge pull request #1 from erkdonovan/new-css

New css