Cleared meteor settings and added gitignore.
Merge commit, used leo's stuff
Merge branch 'master' of https://github.com/amedeedaboville/battleships