c5510d6de0
Conflicts: CMakeLists.txt Doxyfile changelog.md readme.md websocketpp/version.hpp
Conflicts: CMakeLists.txt Doxyfile changelog.md readme.md websocketpp/version.hpp