Project Tester, exercise_4
merge with juan
Merge branch 'master' of https://github.com/nicogarcia/sd.git