Dates working and updating scope
Merge branch 'master' of https://github.com/SamuSan/SWEN302_RumBukka_Project