updated .gitignore so I dont accidentally push .idea folder again
Merge branch 'master' of https://github.com/Not2EXceL/ClashOfBlocks