fixed email
Merge branch 'master' of github.com:fablabnbg/gossen_m701x
Conflicts:
	gossen_metrawatt_parse.py