test1 branch
master branch test
Merge branch 'test1'

Conflicts:
	Solver.py