Merge pull request #205 from rjynn/master

UI testing works :D
User lists work
Merge pull request #206 from cchan5/master

User lists work
Merge remote-tracking branch 'upstream/master'