LogOut LogIn
Merge remote-tracking branch 'origin/V1.0--LogIn'
Merge branch 'master' of https://github.com/FlamingCodes/OlympicsProject

Conflicts:
	main.py
	olympic.db
	views/menu.tpl