Add test Student
Merge remote-tracking branch 'origin/master'

Conflicts:
	__pycache__/catalog.cpython-34.pyc