fixed dropdown menu
fixed conflicts
Merge pull request #21 from oconn/responses

Responses