submission
mergeMerge branch 'master' of https://github.com/atkelsey/556

Conflicts:
	aStar.cpp
	ece556.cpp