added *.iml to .gitignore
Merge branch 'master' of github.com:Efesto/ScrubView