attempting to fix merge conflict
fixed merge conflicts
fixed api call
Merge pull request #4 from stbarrientos/api-hookup

Api hookup