zach's login
Merge pull request #79 from organman91/master

zach's login