testing firebase
Merge branch 'master' of https://github.com/Tsengsation/HolyShift

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/res/values/strings.xml