minor
Merge branch 'master' of github.com:fab4100/tools

Conflicts:
	python/roofline.py