Merge pull request #140 from jpark3000/advanced_css

Advanced css
fix css file to avoid heroku conflicts
Merge branch 'master' into advanced_css