Merge branch 'master' of https://github.com/redrabbit7/scala-dev

Conflicts:
	NTP Service Application/README.txt
Merge branch 'master' of https://github.com/redrabbit7/scala-dev

Conflicts:
	NTP Service Application/README.txt