Merge remote-tracking branch 'origin/master' into twitter_api

# Conflicts:
#	backend/app_be/apps.py
#	backend/app_be/models.py
#	backend/app_be/urls.py

backend/app_be/views/rest_api.py

@@ -2,9 +2,14 @@ import logging
 
 from django.http import JsonResponse
 
-from rest_framework.decorators import api_view
 from py_jwt_validator import PyJwtValidator, PyJwtException
 
+from rest_framework.decorators import api_view
+from rest_framework.viewsets import ModelViewSet
+
+from app_be.models import Feed
+from app_be.serializers import FeedSerializer
+
 logger = logging.getLogger(__name__)
 
 
@@ -51,8 +56,15 @@ class LoginClass:
 
         return JsonResponse({'user': user_sub}, safe=False, status=200)
 
+
 class TwitterClass:
     @staticmethod
     @api_view(['GET'])
     def getLastSixTweets():
-        return JsonResponse({[{"asdf","asdf","sdfasdf","asdf"},{"asdf","asdf","sdfasdf","asdf"}]}, safe=False, status=200)
+        return JsonResponse({[{"asdf", "asdf", "sdfasdf", "asdf"}, {"asdf", "asdf", "sdfasdf", "asdf"}]}, safe=False,
+                            status=200)
+
+
+class FeedViewSet(ModelViewSet):
+    queryset = Feed.objects.all()
+    serializer_class = FeedSerializer