Fixed the date properly
Merge branch 'master' of https://github.com/HamidM250/S-Ware
Fixed the notes
Fixed Merge
Matt fixed the tests