Merge branch 'master' of D:\GitHub\pointManager with conflicts.
Merge branch 'master' of D:\GitHub\pointManager with conflicts.