Uploaded users GPS location to Parse
Merge remote-tracking branch 'origin/master'
merged everything together