Began user and user authentication stuff
Merge branch master