terribly insufficient commit, because i'm leaving for the night.
Merge pull request #1 from keaty/user-logic

User logic
combined team members' work into one branch to push to fork.
conflicts resolved
Merge pull request #11 from keaty/master

combined team members' work into one fork to push to main repo