WIP
Merge branch 'master' of github.com:andak/eit

Conflicts:
	code/EiT/src/main.c
Merge branch 'master' of github.com:andak/eit