CONTRIBUTING.md
Merge branch 'gh-pages' of github.com:JamieMason/phantomjs into gh-pages

* 'gh-pages' of github.com:JamieMason/phantomjs:
  CONTRIBUTING.md

Conflicts:
	CONTRIBUTING.md