Merge pull request #2 from ptwich2/master

Update develop so users can login
Merge eddieBranch to develop branch.