nota_01 added
My fist commit on my branch
actualizacion archivo Readme.txt
Merge branch 'master' of https://github.com/matiasiacono/ISSDCourse
update tests.js by aalmada
Merge branch 'aalmada'

Conflicts:
	Readme.txt
jQuery presentation
Merge from Master

Discarded conflicted files