09ddbed884305418aadf40b05515d61fb69183a7
Umm... I have never had to deal with conflicts before. I don't know if I did this right. If I made a mistake on committing, please tell me.
Languages
C++
85.7%
Lua
4.3%
C
4.3%
Rich Text Format
2.3%
CMake
1.1%
Other
2%