css changes
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
top absolute tagline div
remove extraneous stuff
fixed merge conflict
fixed merge conflicts
Merge pull request #86 from jasonMatney/jason

some merge and css conflicts fixed