Rays first change
Ray's second change
Merge branch 'master' of https://github.com/chscodecamp/github