final commit for today
final commit for today
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/support_annotations_20_0_0.xml
	.idea/libraries/support_v4_20_0_0.xml
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/comfort/temple/com/testgreeter/MyActivity.java
sign in screen and greeter added