changed .gitignore to skip maven crap
fixed conflict in .gitignore