inserto de problemas e impactos
repito commit
Merge branch 'master' of https://github.com/pablohe/whpc2014smn

Conflicts:
	problema.inc.tex
acomodé los cambios en slide 1
Merge branch 'master' of https://github.com/pablohe/whpc2014smn

Conflicts:
	WHPC14-SMN.tex
	problema.inc.tex