Final commit
Merge pull request #15 from BrandtWilson/ntp-dev

Ntp dev