Merge branch 'master' of /home/silvia/Documents/Dropbox/school/mda/mda-recognition-project with conflicts.
report updated