Merge branch 'master' of github.com:ambertunnell/worldview into ben_branch
Merge branch 'master' of github.com:ambertunnell/worldview into ben_branch
Photos can be deleted from the dashboard and in the database
Merge pull request #17 from ambertunnell/ben_branch

Ben branch