Oauth2.0 implementation for Android
.gitignore file conflict resolved