changes
Merge branch 'master' of https://github.com/jashook/sci-comp.git