Mar 24 11pm 2014
Merge branch 'master' of https://github.com/winday0215/COP5536-Dijkstra

Conflicts:
	dijkstra.cpp
	graph.cpp
	graph.h
	scheme.cpp