updated homepage
Merge branch 'master' into moins
working login page along with redirect
working login page along with redirect
resolved conflict