Add feh
Merge branch 'master' of github.com:jaywink/ubuntu-post-install

Conflicts:
	ubuntu-post-install-script.sh