Roster modifications
Merge branch 'master' of https://github.com/florescu/IBMS-Group-G7

Conflicts:
	Code/IBMS-Group-G7/src/Roster.java