update
Merge branch 'master' of https://github.com/vlttnv/eneza

Conflicts:
	student.html