removed .iml files from .gitignore
fixed post content
er
er
Merge remote-tracking branch 'origin/master'