Merge pull request #1 from fdizile/master

Merge
Reformatted Android
Fixed .gitignore
Merge pull request #2 from fdizile/android

Android