working on authentication and authorization
changes
Merge branch 'jeremy_working'