Changed python from 00PythonSoftware to normal conda
Merge branch 'master' of github.com:jangerritharms/home

Conflicts:
	.zshrc