My first commit
Merge https://github.com/jdr22/it266