Commit due to conflicts
solver.php
Merge branch 'master' of https://github.com/cpbael/C4Lk-tour

Conflicts:
	solver.php
	upload/input.txt