added challenge field to login
updated logout and user/edit to accomodate challenge id
Merge branch 'master' of https://github.com/mjminc/project2

another merge
Merge pull request #44 from rasbabbo/master

cleaned up a loquacious logistical login
change yml file
rearranged folders