Merge branch 'master' of C:\wamp\www\PHP\ProjectX with conflicts.
Test commit