lots of work
Merge branch 'master' of https://github.com/kennywulee/roster

Conflicts:
	roster.c