Merged my working version of the SafetyApp with Robin's version with settings.  Still need to remove the redundancy
Removed the editable text fields from the home page and changed them to strings.
Added the two other buttons (colored) and set up a basic relative layout for them.  Also added call functionality (needs to be tested with a phone) for the emergency (oh shit) button.  App also now checks to see if you are using a phone before sending a text or calling the emergency number.
Added comments
Changed the error message for isValidPhoneNumber()
Changed messages to be more professional, and changed units.  Hopefully the layout works better on all devices.
No major changes, just making sure I don't lose them
Merged the master and feature_settings branch