return val fix
Merge branch 'master' of https://github.com/vi-s/ProgrammingPractice

Conflicts:
	.idea/workspace.xml
	src/MaxNoy.java