Interfaz principal
Merge branch 'master' of https://github.com/imp14a/lab_fisica