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

Conflicts:
	.config/sublime-text-3/Cache/Default/Startup.cache
	.config/sublime-text-3/Local/Session.sublime_metrics
	.config/sublime-text-3/Local/Session.sublime_session
	.config/sublime-text-3/Packages/User/Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b
	.config/sublime-text-3/Packages/User/Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b.info
	.config/sublime-text-3/Packages/User/Package Control.last-run
	.config/xfce4/panel/whiskermenu-1.rc
	.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
	.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
	.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
	.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml