COnflict change
Merge branch 'master' of https://github.com/TescoDiets/THW-APP

Conflicts:
TestFile.txt
conflict resolved
Resolved