Group 3 commit
Merge branch 'master' of https://github.com/StoneyJackson/rollcall
Group 3's commit with fixes
Conflicts:
	rollcall.txt
Merge branch 'master' of https://github.com/StoneyJackson/rollcall

Conflicts:
	rollcall.txt