join button working
Merge branch 'master1'
updating
master fixed
Merge branch 'master' into doug
clicking ‘details’ button now knows which wish we want to see the details of, still need to fix the segue and how the data will be passed to the DetailsViewController