Touch
Merge branch 'master' of https://github.com/benavern/FirstApp

Conflicts:
	app/build/outputs/apk/app-debug-unaligned.apk
	app/build/outputs/apk/app-debug.apk