Add missing return statement
Merge branch 'master' of https://github.com/blegat/projectname

Conflicts:
	main.c