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

Conflicts:
	.config/bleachbit/bleachbit.ini
	.config/ibus/bus/f52be66a7bdc5f4289658072535094b5-unix-0
	.config/xfce4/panel/whiskermenu-1.rc
	.mozilla/firefox/9nm53k9w.default/healthreport.sqlite
	.mozilla/firefox/9nm53k9w.default/netpredictions.sqlite
	.mozilla/firefox/9nm53k9w.default/permissions.sqlite
	.mozilla/firefox/9nm53k9w.default/places.sqlite
	.mozilla/firefox/td2ch9zg.default/cookies.sqlite.bak
	.mozilla/firefox/td2ch9zg.default/cookies.sqlite.bak-rebuild
	.mozilla/firefox/td2ch9zg.default/healthreport.sqlite
	.mozilla/firefox/td2ch9zg.default/healthreport/state.json
	.mozilla/firefox/td2ch9zg.default/localstore.rdf
	.mozilla/firefox/td2ch9zg.default/permissions.sqlite
	.mozilla/firefox/td2ch9zg.default/places.sqlite
	.mozilla/firefox/td2ch9zg.default/prefs.js
	.purple/blist.xml
Pow