ubuntu restricted extras install
Merge branch 'master' of https://github.com/SweetAndLow/dotfiles

Conflicts:
	setup-programs.sh