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
Merge branch 'master' of github.com:pip182/ballin-octo-wallhack

Conflicts:
	.bash_aliases
	.config/dconf/user
	.config/sublime-text-3/Cache/Default/Startup.cache
	.config/sublime-text-3/Index/LOG
	.config/sublime-text-3/Index/LOG.old
	.config/sublime-text-3/Installed Packages/PyV8/linux64-p3/config.json
	.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/launcher-13/14073850502.desktop
	.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
	.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
	.ssh/id_rsa
	.ssh/id_rsa.pub
	.ssh/known_hosts
Why
Merge branch 'master' of github.com:pip182/ballin-octo-wallhack

Conflicts:
	.config/dconf/user
	.config/sublime-text-3/Cache/Default/Startup.cache
	.config/sublime-text-3/Index/LOG.old
	.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/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/sublime-text-3/Packages/User/Package Control.last-run.orig
	.config/xfce4/helpers.rc
	.config/xfce4/panel/launcher-7/14094471591.desktop
	.config/xfce4/panel/launcher-8/14089235562.desktop
	.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
	.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml