bgb
Merge branch 'master' of https://github.com/Advanced-Evolution/Exam-Schedule

Conflicts:
	login.html
Revert "Merge branch 'master' of https://github.com/Advanced-Evolution/Exam-Schedule"

Conflicts:
	login.html