preliminary image support
clean up
Merge branch 'master' of https://github.com/Matthew14/social