Testing a merge conflict
Merge branch 'master' of https://github.com/SaveThatDish/STD.git

Conflicts:
	SaveThatDish/testFetchPush/DummyFIle