ny planner
Merge branch 'master' of https://github.com/cthGoman/shrdlite

Conflicts:
	javaprolog/State.java