Merge remote-tracking branch 'github/master'
Made it so the permissions page works better
Committing so that I can work on another computer