Merge branch 'master' of https://github.com/jldavid/prkng

Conflicts:
	code/prkng/Map.m