update map.h map.cc main.cc Makefile
temp
claim
Merge branch 'master' of https://github.com/wuyifat/CS220_Framework

Conflicts:
	Headers/claim.h
	Source/main.cc