Fixed Manifest and added toast for failed Google API
Made multi-catch statements and diamond structures
Update README.md
Merge remote-tracking branch 'upstream/master'
Merge pull request #112 from RitwikGupta/master

Fixed Manifest and added toast for failed Google API. We'll have to take out that local.properties folder though...
Merge remote-tracking branch 'upstream/master'