fixed merge conflict (again :D), added glClear before loop in main.c