There is no need to distribute .lock file
Added syntax highlighting for php snippets
Github does not like syntax highlighting in lists
Merge pull request #3 from bliker/develop

There is no need to distribute .lock file
Merge remote-tracking branch 'upstream/develop' into Phpunit