Merge remote-tracking branch 'frat/master'

items/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from  models import Item
+from  items.models import Item
 
 # Register your models here.
 admin.site.register(Item)

items/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import url
-from . import views
+from items import views
 
 urlpatterns = [
     url(r'^$', views.list, name='list'),

items/views.py

@@ -4,8 +4,9 @@ from django.utils import timezone
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.contrib.auth.decorators import login_required
 from django.db.models import Q
-from models import Item
+
 from committee.models import Committee
+from items.models import Item
 
 def isAuthorised(request, item):
     return (request.user == item.committee.chair