Merge pull request #3 from CST316GroupO/master

Grabbing latest changes
Merge remote-tracking branch 'upstream/master'
Getting Gabe's changes
Merge remote-tracking branch 'upstream/master'
Backend for google services
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/build.gradle
Fixing build.gradle merge
more chanages build.gradle
Merge remote-tracking branch 'upstream/master'
Pulling latest
Merge pull request #21 from austinpruitt/master

google services backend