second commit from php storm
Merge remote-tracking branch 'origin/master'

Conflicts:
	www.cccotedivoireturkey.com/index.html