fixed
Merge branch 'master' of github.com:Contegix/cloudykangaroo

* 'master' of github.com:Contegix/cloudykangaroo:
  fixed

Conflicts:
	routes/puppet.js