conflict resolution
Merge branch 'master' of https://github.com/swsien127/GoogleDriveProject

Conflicts:
	src/com/example/googledriveproject/MainActivity.java