fix warning caused by void return statement
Merge branch 'development' of https://github.com/nickheron/testproject into feature1-mdr

Conflicts:
	Hello/hello.c