add new line 2
Merge branch 'master' of https://github.com/d006/Test

Conflicts:
	InfoPlist.strings