ipython
Merge branch 'master' of github.com:gwillem/tech-desktop-configuration

Conflicts:
	desktop.yml