Merge pull request #25 from dawgtrades/master

merges
login successful
Merge pull request #75 from jrec15/master

login successful