Sin errores, falta checar
Merge branch 'master' of https://github.com/vrmpx/mcc_compiladores2014

Conflicts:
	pp3/.DS_Store
	pp3/samples/.DS_Store