By #User A- offshore programmer
By ##User-B
offshore conflict fixed
Merge branch 'offshore'

Conflicts:
	file_1.html