Fixed the last of the merge conflicts
Added password reset functionality
pushing to master