working authentications
Merge pull request #3 from chriswright47/some_routes

working authentications
fixed merge conflict