merged with master
Merge branch 'master' of https://github.com/cschu004/CS180_Project into camera
Explore and singlepicture working
favorites api
favorites cleanup
Merge branch 'api'