Fixed .gitignore
Delete .gitignore
Merge pull request #1 from ClashOfBlocks/master

Merging
Fixed and added a lot of stuff
Merge pull request #6 from stilldabomb/master

Fixed and added a lot of stuff