commiting for pull
Merge branch 'master' of github.com:jeffdill2/hunger-crunch-tournament into joshua-smith
Merge branch 'master' of github.com:jeffdill2/hunger-crunch-tournament into joshua-smith
commiting to pull master
Merge branch 'master' of github.com:jeffdill2/hunger-crunch-tournament into joshua-smith
commit for pull from master
fixed merge conflicts
Merge pull request #48 from jeffdill2/joshua-smith

Joshua smith