return val change
Merge branch 'master' of https://github.com/terier/ioncon

Conflicts:
	main.cpp