userlist changes
Merge branch 'master' of github.com:gavinhoward/byu-cs340-sixmix