Next line added by Dmitri
Merge branch 'master' of https://github.com/RaylanJane/repo1

Conflicts:
	UBCCPSCGitLab-original/README.txt