code
Merge branch 'master' of https://github.com/yftung7/2014_DM_Project

Conflicts:
	Project/DMProj/DMProj/graph.cpp