Turned datetime to formatted string for json serialization
Merge branch 'master' of https://github.com/Solanar/CMPUT410-Project into serializeTimeInJson