add .gitignore file generated for eclipse, java, android
First commit of Android Project. Although .gitignore was generated for Android, Java, and Eclipse some of these files may not be important or redundant.
fixed .gitignore conflict