Revert "changed gitignore and stuff"

This reverts commit 40273af1a51a7ef33839eb854024c0e2e46dfbd5.
Merge branch 'master' of https://github.com/diab0l/ShrimpShock