Merge branch 'master' of https://github.com/SpaceG/ScienceMedium

Conflicts:
README.md