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

Conflicts:
	ubuntu-desktop/bash_aliases
	ubuntu-desktop/bashrc
	ubuntu-desktop/i3/config
	ubuntu/bash_aliases