Added GPS pinging, Geofences, and Category Enums. Modified manifest to include service to handle Geofencing and proper GPS permissions.
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.
Updated .gitignore
Merge branch 'master' of https://github.com/aehernandez/Lifemeter

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml