added twitter, updated with djangorestframwork, and templates