Updated and moved feedme.
Merge pull request #115 from tenach/master

Updated and moved feedme.