feed updates
Merge branch 'master' of https://github.com/pfletch1023/Gandalf into paul
mergin
Merge pull request #44 from pfletch1023/paul

feed updates