Merge pull request #2 from jjperezaguinaga/master

Remixeando like a boss.
Cuadruples text

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

Conflicts:
	exec.sh

Signed-off-by: Alan Rodriguez <alanrodriguezromero@gmail.com>
Merge pull request #3 from jjperezaguinaga/master

Redirect output de javamix a orig/cuadruples.txt
Merge branch 'master' of git://github.com/shnere/CParserFinal