merge
Merge branch 'master' of https://github.com/julianaleon8/IA2_2014

Conflicts:
	Proyecto2/gabil.py
Merge branch 'master' of https://github.com/julianaleon8/IA2_2014
para compilar solo deben hacer pdflatex seminario.tex
Merge branch 'master' of https://github.com/julianaleon8/IA2_2014