modified:   apache.pp
ensure changed to running. My brain feels drunk.
Merge branch 'master' of https://github.com/venkmann/puppet-demo

Conflicts:
	apache.pp

fixed conflict