initial commit
resume mostly complete
Merge branch 'master' into gh-pages
CSS fixes