resolving conflict
Merge branch 'master' of https://github.com/FliesWithWind/SoftwareDesign.git
Merge branch 'master' of https://github.com/FliesWithWind/SoftwareDesign.git
1. Edition in data type
2. Server Managers
3. Addition of DateTeller