Uncommited Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Orienteering/src/jp/co/worksap/global/Heuristic.java