changes in test file to differnciate between tags
updating the text file fourth time
resolved a commit conflict
updated fifth sample edited
Merge branch 'develop' into staging

Conflicts:
	gitTest.txt
Merge branch 'staging'

Conflicts:
	gitTest.txt