9-21-14 (Lappy)
Merge branch 'master' of github.com:pip182/ballin-octo-wallhack

Conflicts:
	.config/dconf/user
	.config/xfce4/desktop/icons.screen0-832x433.rc
	.config/xfce4/panel/whiskermenu-7.rc
	.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
	.ssh/known_hosts