initial hybrid files
Merge branch 'master' of https://github.com/natj/csc-ss14