Added some functions for reading the database
Added some functions for reading the database
Added some functions for reading the database
Added some functions for reading the database
Added GPS pinging, Geofences, and Category Enums. Modified manifest to include service to handle Geofencing and proper GPS permissions.
Create DbList

creates table of activities that the user can do
Added GPS pings, Geofences, and Category Enums. Updated manifest to reflect proper GPS permission and Geofence Service Intent handler
Added GPS ping, Geofences, and Category Enums. Updated Manifest.
Create DbActivities

creates db of activities and timing that are taken from the geofencing object
Update DbList
Updated .gitignore
Merge branch 'master' of https://github.com/aehernandez/Lifemeter

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml
Update MyActivity.java
Rename DbActivities to DbActivities.java
Rename DbList to DbList.java
Update MyActivity.java
Update MyActivity.java
Changed MyActivity -> Lifemeter and Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidManifest.xml
	project.properties
	src/com/example/Lifemeter/MyActivity.java