added a function to calculate the date
Merge remote-tracking branch 'origin/protoBranch' into development