Sync
Merge branch 'master' of github.com:wenzlern/ma

Conflicts:
	python/Uoft_plot/Uoft_plot.py