bug fixed
Merge branch 'master' of https://github.com/timartesis/codeandballs

Conflicts:
	Examenmonitor/Database/db