updated buncho shit for updating doctor stuff
Merge branch 'new_master' of https://github.com/thEtan/Mini-Project into new_master
Updated login session credential stuff
updated gitignore
Merge branch 'ET-Dev2' into new_master
blah
changed gitignore again
fixed merge conflict
fixed merge conflicts in gitgnore