Update main.cpp
Merge remote-tracking branch 'origin/first_edit'