testing conflict 4 (Local)
Merge branch 'master' of https://github.com/tmpTstB/TestRepo002

Conflicts:
	testGit002/testGit002/AppDelegate.swift