Combined server.pp into main init.pp
Merge branch 'master' of /home/satom/ModuleWork/ntp