M2 v1.0
Merge branch 'master' of https://github.com/LavinJ/LabFisica2