switching branches
Results page, for doctor/friend
merging new_master and my dev
fixed merge conflicts
changes
trying to fix the world by fixing these merge conflicts so we have a new_master with DBAO
updated git ignore to disclude more build files