--- a/smiley/views.py	Sun Dec 20 22:18:59 2015 -0600
+++ b/smiley/views.py	Sat Dec 26 15:10:55 2015 -0600
@@ -1,8 +1,7 @@
 """
 Views for the Smiley application.
 """
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render
 from django.contrib.auth.decorators import login_required
 from django.views.decorators.http import require_GET
 
@@ -11,8 +10,6 @@
 @login_required
 @require_GET
 def farm(request, extra=False):
-    return render_to_response('smiley/smiley_farm.html', {
+    return render(request, 'smiley/smiley_farm.html', {
         'smilies': Smiley.objects.get_smilies(extra),
-        },
-        context_instance = RequestContext(request))
-
+        })