going through code and commenting on errors
merging conflicts
Merge branch 'master' of github.com:mas-group/sdp_ws2013_ompl

Conflicts:
	tutorials/geometricPlanningSE3.py