agrego lo que se va a quedar
Merge branch 'master' of github.com:a9lara/GitRepository

Conflicts:
	.ipynb_checkpoints/7-checkpoint.ipynb
	.ipynb_checkpoints/TwoPlanetsOrbit-Copy1-checkpoint.ipynb
	DemostracionTrigonométricaParaAmanda.tex~