Updates for Heroku
add sass
add sass
second commit
merge conflict