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

Conflicts:
	MapResolver.jar
	src/hps/nyu/fa14/solver/OpticalMapSolver.java
Merge branch 'master' of https://github.com/ck1456/OpticalMaps
same
Merge branch 'master' of https://github.com/ck1456/OpticalMaps
modified scripts to work on linux
Cleaned up the code a little bit and finished packaging so that the ant build script will build a distributable now.