api is working
Merge pull request #4 from xtina-starr/api

api is working!!!
merge conflicts