Add Jordan Hudgens and David Husa's credentials to roster.txt
Fix merge conflicts