removed buttons

removed 2 buttons
Merge remote-tracking branch 'origin/master'

Conflicts:
	Triage/bin/Triage.apk
	Triage/bin/classes.dex
	Triage/bin/classes/com/nurses/triage/Screen_condition.class
	Triage/bin/resources.ap_
Merge branch 'master' of https://github.com/deividc/CSC207-TriageProgram

Conflicts:
	Triage/bin/Triage.apk
	Triage/bin/classes.dex
	Triage/bin/classes/com/example/triage/R$id.class
	Triage/gen/com/example/triage/R.java