Merging main.cpp
merge