Jamie is updating before commiting, modified user.php to populate user table and added user-functions.php as support
Merge branch 'master' of https://github.com/the-river/ResearchDatabase
T -- Changed format of permissions table
Commiting small changes to user.php
Merge branch 'master' of https://github.com/the-river/ResearchDatabase