End of stress_test
Merge branch 'master' of https://github.com/PAA2014/Trabalho_1_Bim