init.
Merge branch 'master' of https://github.com/rainsun/puppet_study
clean files
add nginx configuration
Merge branch 'master' of https://github.com/rainsun/puppet_study
Format and add ignore
puppet lint