Fuck that old shit, this is what we'll use now!!
Merge branch 'master' of https://github.com/joelholmberg/RemindMe.git

Conflicts:
	RemindMe/src/com/example/remindme/LocationBasedServicesV1.java
	RemindMe/src/com/example/remindme/MyItemizedOverlay.java