Nos lleva la puta
Merge branch 'master' of https://github.com/sebasgott/MedicinaForense

Conflicts:
	gen/com/asomef/medicinaforense/R.java
	res/values/strings.xml