ttt
Merge branch 'master' of https://github.com/Dinidu/safari

Conflicts:
	abc.txt
resolved