test
Merge branch 'master' of https://github.com/dac-intern/survey

Conflicts:
	test.c