end 2.
Merge branch 'master' of https://github.com/danfergo/FEUP-LAIG1415-T1G11