Closes #3
Merge branch 'master' of https://github.com/merikan/skltp-puppet

Conflicts:
	puppet/manifests/singleserver.pp