Added png and jpg stuff
Merge pull request #16 from IPPETAD/importing

Added png and jpg stuff