Merge branch 'master' of https://github.com/EmilioFlores/TiroParabolico

Conflicts:
	nbproject/private/private.xml
Merge branch 'master' of https://github.com/EmilioFlores/ExamenParcial2

Conflicts:
	nbproject/private/private.xml