changed compiler from clang++ to g++ / fixed some warnings
fixed merge conflict