kjhjhkj
Merge remote-tracking branch 'origin/master'

Conflicts:
	LexusQueue/app/src/main/AndroidManifest.xml
	LexusQueue/app/src/main/java/com/example/lexusqueue/main.java
	LexusQueue/app/src/main/res/layout/activity_main.xml
	LexusQueue/app/src/main/res/values/strings.xml