Merge branch 'master' into gh-pages
changed from using .oneCol twoCol etc to column-1 column-2 etc
changed markup to match new css
fixed css to allow columns again
Merge branch 'master' into gh-pages