serverspecのテスト内容更新
Merge branch 'master' of github.com:keokent/sample_app_puppet

Conflicts:
	sample_app_manifest.pp