Merge branch 'master' of github.com:schakrav/new_lifespan
Merge branch 'master' of github.com:schakrav/new_lifespan
Merge branch 'master' of github.com:schakrav/new_lifespan
general editing
Merge pull request #34 from Aliya-cmuq/phase_5_edit

Phase 5 edit