Updated gitignore to filter mac and eclipse genereated files
Fix merge conflicts on .gitignore