JÄVLA FITT GIT
Merge branch 'master' of https://github.com/Carbapen/DTriage

Conflicts:
	assets/triage.db
	gen/com/cf/triage/R.java
	src/com/cf/triage/MainActivity.java
	src/com/cf/triage/Triage_UI.java