init commit
Merge branch 'master' of http://github.com/shujuan/CS220_Framework-master

Conflicts:
	Headers/claim.h
	Headers/edge.h
	Headers/grid.h
	Headers/netlist.h
	Headers/node.h
	Headers/path.h
	Headers/pathsegment.h
	Headers/point.h
	Headers/problem_object.h
	Headers/segmentgroup.h
	Utilities/JSON_parser/Headers/json_array.h
	Utilities/JSON_parser/Headers/json_name_value.h
	Utilities/JSON_parser/Headers/json_object.h
	Utilities/JSON_parser/Headers/json_parser.h
	Utilities/JSON_parser/Headers/json_value.h
	Utilities/JSON_parser/Source/json_parser.lex
	Utilities/JSON_parser/json_parser_lex.cc