Fixed merge conflict
Added more libs, in preparation of important qutilities into this project
Removed ignored files from GIT
Added ignored files