Some changed things

Nothing extensive
Merge branch 'master' of https://github.com/CS347team4/rollcall