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
removed some bs
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Merge pull request #114 from jasonMatney/jason

removed some test js and txt
updated topnav
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #115 from LasseSviland/master

	updated topnav
Fixed merge conflicts, fingers crossed this works