favorites api
favorites cleanup
Merge branch 'api'
Merge branch 'api' of https://github.com/cschu004/CS180_Project into camera
Merge branch 'master' of https://github.com/cschu004/CS180_Project into camera
merge with camera
gps will now be updated on the server