added twitter, updated with djangorestframwork, and templates
Merge pull request #2 from masterfung/develop

added twitter, updated with djangorestframwork, and templates