fixed minor typos
merging commits

Merge branch 'master' of github.com:scollier/project-atomic-lab-end-to-end