Merge branch 'Artur-Features'
Hallo Artur
Merge remote-tracking branch 'origin/David-Features'

Conflicts:
	HelloWorld.c
Merge branch 'master' of https://github.com/SE-HFU/Generalprobe