Merge pull request #43 from pfletch1023/paul

Work on feed
Merge branch 'master' of https://github.com/pfletch1023/Gandalf into paul
mergin