forgot password page fixed
Resolved merge conflict for forgot password screen
Merge pull request #18 from abhishek0647/nh_forgot_password

forgot password page fixed