switching branches
Results page, for doctor/friend
merging new_master and my dev
fixed merge conflicts
changes