puts test onnly if humor is bad
Merge branch 'master' of github.com:BreinsNet/puppet-pulp

Conflicts:
	ARakefile

        I tried to do my best to not break the code when merging