Merge branch 'turkishFight'
gitignore
gitignore
inline method
remove idea settings
Merge branch 'master' into turkishFight