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

Conflicts:
	.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
	.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml