add image support
merge
Merge branch 'master' of github.com:Avricot/farmy