startup.
Merge branch 'master' of https://github.com/antico5/desktop_config

Conflicts:
	.fluxbox/startup