Update .gitignore
Merge branch 'master' of github.com:Logi0/vilify
Some more refactering and fix errors
Refactering