Updated todo
Merge remote-tracking branch 'origin/master-working' into kevin-bnch
Working on sorting lists and names alphabetically
Merge remote-tracking branch 'origin/kevin-bnch' into Miguel-Test-Branch