adding api
adding everyones changes
Merge branch 'develop' of github.com:mlee284045/sidebar into isabelle