updated email sending
updated
login screen fully functional, errors caught by try/except function
fixing conflicts
Merge branch 'master' of https://github.com/RichLogan/JustHealth