Experiment with simultaneous same line editing editing
fixed merge conflict the quick and dirty way 

Merge remote-tracking branch 'origin/master'

Conflicts resolved:
	Lab1/res/values/strings.xml