Merge branch 'master' of /home/ksibod/Documents/CSCE/4410/UNT-Parking-App with conflicts.
Merge remote-tracking branch 'origin/master'
I changed the way the map markers function. Instead of always displaying the alert dialog, it checks to see if the gps hardware is already turned on.  If it is, it opens straight to the map. If not, the alert dialog pops up with a new title and an option to cancel or go straight to the location settings on the phone to turn on gps.