Merge branch 'master' of D:\www\infi with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Test PhpStorm