Added .idea to ignore
Merge branch 'master' of https://github.com/aptitud/SimpleBattleship