moved images to img directory
merge conflict fixed
Merge branch 'master' of github.com:JoeIsaacson/homefry-proto