stuff
updated gitignore
fixed merge conflicts in gitignore
Doctor results/search, view/create reviews
Merge branch 'dev' into new_master
merge conflicts
fixing merge commfits
updated buncho shit for updating doctor stuff