Updated my branch to match local version

Finished sprint deliverables, updating version