adam's first commit
Merge https://github.com/chscodecamp/github