new branch
fix merge
adding spotify sdk to android and authentication
Merge branch 'backend' of https://github.com/hdavidzhu/MobileProtoMusicSprint into backend
'life is grand and we need to merge'
Set up initalizations, but abandoning this branch essentially
'back on the back end'
Merge branch 'backend' of https://github.com/hdavidzhu/MobileProtoMusicSprint into backend
working on the backend
daaaavidddd
Switching to firebase.
up to date
IT WORKSSSS
Merge branch 'master' into backend

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/hdavidzhu/mobileprotomusicsprint/MyActivity.java
Merge pull request #1 from sihrc/backend

Backend