Merge branch 'master' into registration
Merge branch 'registration' of https://github.com/chscodecamp/web102.git into registration