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

Conflicts:
	testGit002/testGit002/FirstViewController.swift
Merge branch 'master' of https://github.com/tmpTstB/TestRepo002