he made me do it
Merge branch 'master' of github.com:jkleininger/dots

Conflicts:
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/artifacts.xml
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/.baseConfigIniTimestamp
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/config.ini
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.equinox.simpleconfigurator/.baseBundlesInfoTimestamp
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.osgi/bundles/111/data/-978001819/artifacts.xml
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.osgi/bundles/111/data/-978001819/content.jar
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.osgi/bundles/111/data/2099652162/artifacts.xml
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.osgi/bundles/111/data/2099652162/content.xml
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.osgi/bundles/120/data/cache.timestamps
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.osgi/bundles/120/data/listener_1925729951/artifacts.jar
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.osgi/bundles/120/data/listener_1925729951/content.jar
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.osgi/bundles/120/data/timestamps1438412847
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.osgi/bundles/131/data/-163412334/content.xml
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.osgi/bundles/131/data/1432946284/artifacts.xml
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.osgi/bundles/131/data/1432946284/content.xml
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.osgi/bundles/131/data/1759815700/content.xml
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.osgi/bundles/93/data/SCR
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/configuration/org.eclipse.update/platform.xml
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile/.data/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile/.data/.settings/org.eclipse.equinox.p2.metadata.repository.prefs
	.eclipse/org.eclipse.platform_4.3.0_1543616141_linux_gtk_x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile/state.properties
	.fluxbox/styles/jkl/theme.cfg
	.vimperator/info/default/history-command
	.vimperator/info/default/history-search
	.vimperator/info/default/local-marks
i3
Merge branch 'master' of github.com:jkleininger/dots
i3