Added Puppet language
Added Puppet language
Merge branch 'master' of https://github.com/Moliholy/highlight.js

Conflicts:
	src/languages/puppet.js
Merge branch 'master' of github.com:Moliholy/highlight.js into Moliholy-master

Conflicts:
	AUTHORS.en.txt
	docs/css-classes-reference.rst
	src/test.html
Shorter puppet example in test.html
Add Puppet to CHANGES.md