complete login page
Merge remote-tracking branch 'origin/Lab2' into Lab2
fix shit merge