Updated BMIActivity: added input fields; Added BMIOutputActivity: computes BMI
Resolved conflicts: strings.xml, AndroidManifest.xml