steph doesn't know what was changed here
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/alb4dx/group14.git
todo lists and adding messages to messageQueue from debug