test #2.0
Merge branch 'master' of https://github.com/xakp/EE250.stm8

Conflicts:
	tedgfst.txt