updates
Merge pull request #3 from natewinn/login

updates