Finished merging user stories in Sprint 3. Minor typo fixes in Retro.