updated hookups
Merge pull request #29 from amychiu/amy/development2

updated hookups