all shit
Merge branch 'master' of https://github.com/pcarrasqueira/STR_TP1