updated git ignore and libs
fixed merge