gitignore
Merge branch 'PPMC' of http://github.com/federicomrossi/7506-tp-grupo07 into PPMC

Conflicts:
	.gitignore
Merge branch 'PPMC' of http://github.com/federicomrossi/7506-tp-grupo07 into PPMC

Conflicts:
	.gitignore
	codigo/compresor/compresion_Aritmetico.cpp
Merge branch 'PPMC' of http://github.com/federicomrossi/7506-tp-grupo07 into PPMC

Conflicts:
	codigo/compresor/Ctx0.cpp
	codigo/compresor/CtxN.cpp
	codigo/compresor/Predictor.cpp