image file formats and *.iml were added to gitignore
Merge remote-tracking branch 'origin/master'