v1.1.6
v1.1.6

Conflicts:
	Triage/bin/Triage.apk
	Triage/bin/classes.dex
	Triage/bin/classes/com/nurses/triage/MainActivity.class
	Triage/bin/classes/com/nurses/triage/Screen_condition.class
	Triage/bin/res/crunch/drawable-xxhdpi/field.png
	Triage/bin/res/crunch/drawable-xxhdpi/triage_message.png
	Triage/bin/resources.ap_
	Triage/res/layout/activity_screen_condition.xml