ubuntu
Merge branch 'master' of github.com:oren/dotfiles

Conflicts:
	readme.md
	ubuntu-desktop/bash_profile
	ubuntu-desktop/bashrc
	ubuntu-desktop/tmux.conf
	ubuntu-x120e/bashrc