Merge branch 'master' of https://github.com/thisMagpie/sciruby.com
Merge branch 'master' of https://github.com/thisMagpie/sciruby.com