Updated .gitignore file

Merged two .gitignore files together, one for Eclipse and the other for Android.