new feature on new branch
Merge branch 'newfeature'

Conflicts:
	test.c
merged
udpate from new branch
merge done on master with updates of newfeature branch