asserts
Merge pull request #6 from spezzino/branchJD

asserts
Merge branch 'origin/sp'

Conflicts:
	tpinfo2/resources/py/edu/uca/prolog/itinerarios.pl
	tpinfo2/src/py/edu/uca/RuteoApp.java
	tpinfo2/src/py/edu/uca/checkItinerario.java