changes
Merge branch 'master' of https://github.com/ck1456/OpticalMaps

Conflicts:
	src/hps/nyu/fa14/OpSample.java
	src/hps/nyu/fa14/solver/OpticalMapSolver.java
local search
LocalSearch, and cutoff finding modified
solver
Merge branch 'master' of https://github.com/ck1456/OpticalMaps

Conflicts:
	MapResolver.jar
	src/hps/nyu/fa14/OpSample.java
	src/hps/nyu/fa14/solver/OpticalMapSolver.java
	src/hps/nyu/fa14/view/OpticalMapplet.java
Merge branch 'master' of github.com:genghis88/OpticalMaps

Adopted minIndex function

Conflicts:
	MapResolver.jar
	src/hps/nyu/fa14/solver/OpticalMapSolver.java