TODO List for developer
Merge branch 'master' of https://github.com/suns3t/puppet-manifest

To deal with non-fast-forward error