pretty java guis
Merge branch 'master' of github.com:a13/dotfiles

Conflicts:
	.xsession