removed *.iml from .gitignore
Merge branch 'master' of https://github.com/olavgg/FlaskIO