asldkj
Merge branch 'master' of https://github.com/Jayis/PDP_Final
fix combine.cpp, add combine.h
combine_debuged
update eva.h
Merge branch 'master' of https://github.com/Jayis/PDP_Final
Merge branch 'reg'

Conflicts:
	main.cpp
compilr
combine
fix confilct
Merge branch 'master' into reg

Conflicts:
	main.cpp