updated shit
updated shit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/graffixnyc/errandrunner/LoginActivity.java
	build.gradle
	gradle/wrapper/gradle-wrapper.properties
more