main.cpp
Resolved conflicts.
Update gitignore