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

Conflicts:
	.config/sublime-text-3/Installed Packages/Goto Bootstrap.sublime-package
	.config/sublime-text-3/Installed Packages/PyV8/linux64-p3/config.json
	.config/sublime-text-3/Installed Packages/Whitespace.sublime-package
	.config/sublime-text-3/Local/Session.sublime_metrics
	.config/sublime-text-3/Local/Session.sublime_session
	.config/vlc/vlc-qt-interface.conf
	.config/xfce4/desktop/icons.screen0-1264x976.rc
	.config/xfce4/helpers.rc
	.config/xfce4/panel/whiskermenu-2.rc
	.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
	.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
	.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
	.gitignore
Jub Jub