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

Conflicts:
	src/hps/nyu/fa14/solver/OpticalMapSolver.java
bad commit
latest
solution, nextSolution update fixed
Update OpticalMapSolver.java
Merge branch 'master' of https://github.com/genghis88/OpticalMaps
Adds local search to get better hypothesis points.