lab3.py
quiz1
Merge branch 'master' of https://github.com/lethi17/csf

Conflicts:
	quiz1.py