Updated Database
Merge remote-tracking branch 'origin/master'

Conflicts:
	GroupProject/install.sql
Merge branch 'master' of https://github.com/jalex26/GroupPExam