think I may have found the issue
Merge branch 'master' of github.com:muffindish411/sample1