updated
Merge branch 'gh-pages' of https://github.com/zacdavidm/cfa_2015_dev into gh-pages