agrega cargar
Merge branch 'master' of https://github.com/farfanoide/ibd_2014_tp1

Conflicts:
	long_var_test.pas
agrega prog ppal par avariable