Merge branch 'master' of github.com:nushio3/ICFPC2013

Conflicts:
	solver/exe-src/smt-synth.hs
	solver/loop-solver.sh
	solver/src/SMTSynth.hs