Update .gitignore resolving conflict

Again trying to know how to not commit WEB-INF/lib files, anyway, no JARs, WARs, EARs file are going to upload using this latest update.