messed with description page
fix merge conflicts
Merge pull request #111 from LasseSviland/master

	started updating layout
stash
fixed merge conflicts
Merge pull request #112 from LasseSviland/master

more updates on the layout
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