Merge branch 'master' of /home/joaonuno/Desktop/UC/SD/ProjectSD with conflicts.
Merge remote-tracking branch 'origin/master'
Merda pó git.