Merge with Ed
functional login
Merge pull request #1 from cschumacher/Curtis

Curtis