merge resolution
Merge branch 'master' of https://github.com/davidgaskins/dot
added phone type enumerated data type