inputs meh

Signed-off-by: Alan Rodriguez <alanrodriguezromero@gmail.com>
Merge branch 'master' of github.com:shnere/CParserFinal

Conflicts:
	base/input.txt
	input.txt
	orig/cuadruples.txt
	orig/input.txt

Signed-off-by: Alan Rodriguez <alanrodriguezromero@gmail.com>
Damn you inputs

Signed-off-by: Alan Rodriguez <alanrodriguezromero@gmail.com>