messed with description page
fix merge conflicts
stash
fixed merge conflicts
fix homepage css
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Merge pull request #113 from jasonMatney/jason

button css