added test_bed
resolved conflict
Merge branch 'master' of https://github.com/jaazpa3/Path_Planning into jaazpa3-master

Conflicts:
	dijkstra/parse_map.py
Merge branch 'master' of https://github.com/hmurraydavis/Path_Planning into jaazpa3-master
Merge branch 'jaazpa3-master'