password kész
password tényleg kész
Merge remote-tracking branch 'origin/lmaresz'

Conflicts:
	program.py
Messing w/ student stuff - Merge branch 'z0'