Fix merge conflicts
Merge branch 'master' of https://github.com/simondai13/Projects-DS.git
Merge branch 'master' of https://github.com/simondai13/Projects-DS.git
Changed IDs to strings