changes by #userB after first merge
Merge branch 'master' of github.com:saransys-testgit1/project-Offshore

Conflicts:
	file_1.html
Merge branch 'master' of github.com:saransys-testgit1/project-Offshore

Conflicts:
	file_1.html