login page
login page and forgot password page done
resolving conflicts on issue-148