initial empty commit
BlockCipherSelfStudy.jl generated files.

    license: MIT
    authors: andrew cooke
    years:   2013
    github:  true
    travis:  true

Julia Version 0.2.0-prerelease+3923 [8af04af83b]
fixing conflict
fixing conflict