loop
Merge branch 'master' of github.com:pip182/ballin-octo-wallhack

Conflicts:
	.gitignore
	.local/share/data/qBittorrent/nova/engines/__init__.pyc
	.local/share/data/qBittorrent/nova/fix_encoding.pyc
	.local/share/data/qBittorrent/nova/socks.pyc
	.local/share/gvfs-metadata/home
	.local/share/gvfs-metadata/root