Built upon authentication system
Merge pull request #7 from CS2014/ross

Built upon authentication system