init ignore
del idea config file
Merge branch 'develop'