merge conflict resolution.
- logs user in on sign up.
Merge pull request #8 from Flamdoodle/pei_stephen

merge conflict resolution.