KQueenState2 med minconflict
Merge branch 'master' of https://github.com/vegaholt/GPS-AIprog

Conflicts:
	src/problemSolver/Main.java
	src/problemSolver/SA.java