same page sync
kirstins changes added
Merge branch 'master' into kristin
changed date time stuff