Modified makefile
Merge branch 'master' of github.com:epintos/TPCripto2
Merge branch 'master' of github.com:epintos/TPCripto2
Merge branch 'master' of github.com:epintos/TPCripto2
Added a test script