class data files
Merge branch 'staging' of github.com:jashapiro/jashapiro.github.com into staging
Merge branch 'master' into staging