added conditional A* path planning
Merge branch 'master' of github.com:amelim/RIP-2013-Final

Conflicts:
	python/main.py
added conditional shortest path planning