Fix merge issues in .gitignore
Merge branch 'master' of github.com:HakrLabs/gohacker