Some cleanup to basic functions. TODO: Admin functions.
Merge branch 'master' of https://github.com/woppels/cs285_hw4