temp staging
Merge branch 'master' of https://github.com/jault3/SE2832-Lab6
Updated dataprovider for joint use