new layout to try
new session starter tmux
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.xinitrc