combineWithHistory in main.cpp
Merge branch 'master' of https://github.com/Jayis/PDP_Final