update
Merge branch 'master' of https://github.com/be5/Classroom

Conflicts:
	classroom.sql
	home.php
	include/database.php
	include/functions.php
	include/session.php
	login.php
	logout.php
	register.php