diff --git a/UNCCScavenger-Server/.gitignore b/UNCCScavenger-Server/.gitignore
index f1b53d7..c9f49b3 100644
--- a/UNCCScavenger-Server/.gitignore
+++ b/UNCCScavenger-Server/.gitignore
@@ -2,3 +2,6 @@ bin/
 include/
 lib/
 local/
+settings.py
+*.swp
+scavenger.db
diff --git a/UNCCScavenger-Server/UNCCScavenger_Server/UNCCScavenger_Server/.gitignore b/UNCCScavenger-Server/UNCCScavenger_Server/UNCCScavenger_Server/.gitignore
new file mode 100644
index 0000000..fce19e4
--- /dev/null
+++ b/UNCCScavenger-Server/UNCCScavenger_Server/UNCCScavenger_Server/.gitignore
@@ -0,0 +1 @@
+settings.py
diff --git a/UNCCScavenger-Server/UNCCScavenger_Server/UNCCScavenger_Server/settings.py b/UNCCScavenger-Server/UNCCScavenger_Server/UNCCScavenger_Server/settings.py
deleted file mode 100644
index 0603c9f..0000000
--- a/UNCCScavenger-Server/UNCCScavenger_Server/UNCCScavenger_Server/settings.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# Django settings for UNCCScavenger_Server project.
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-    # ('Your Name', 'your_email@example.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': 'scavenger.db',                      # Or path to database file if using sqlite3.
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
-    }
-}
-
-# Hosts/domain names that are valid for this site; required if DEBUG is False
-# See https://docs.djangoproject.com/en/1.4/ref/settings/#allowed-hosts
-ALLOWED_HOSTS = []
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# In a Windows environment this must be set to your system time zone.
-TIME_ZONE = 'America/Chicago'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale.
-USE_L10N = True
-
-# If you set this to False, Django will not use timezone-aware datetimes.
-USE_TZ = True
-
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
-MEDIA_URL = ''
-
-# Absolute path to the directory static files should be collected to.
-# Don't put anything in this directory yourself; store your static files
-# in apps' "static/" subdirectories and in STATICFILES_DIRS.
-# Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = ''
-
-# URL prefix for static files.
-# Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/static/'
-
-# Additional locations of static files
-STATICFILES_DIRS = (
-    # Put strings here, like "/home/html/static" or "C:/www/django/static".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-# List of finder classes that know how to find static files in
-# various locations.
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = 'yafkof5)-n4umlwhtln@vj4-a-%0uo=k_eqf$jx-k+hx03&zn*'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    # Uncomment the next line for simple clickjacking protection:
-    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
-)
-
-ROOT_URLCONF = 'UNCCScavenger_Server.urls'
-
-# Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'UNCCScavenger_Server.wsgi.application'
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    # Uncomment the next line to enable the admin:
-    # 'django.contrib.admin',
-    # Uncomment the next line to enable admin documentation:
-    # 'django.contrib.admindocs',
-
-	'scavenger',
-)
-
-# A sample logging configuration. The only tangible logging
-# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error when DEBUG=False.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'filters': {
-        'require_debug_false': {
-            '()': 'django.utils.log.RequireDebugFalse'
-        }
-    },
-    'handlers': {
-        'mail_admins': {
-            'level': 'ERROR',
-            'filters': ['require_debug_false'],
-            'class': 'django.utils.log.AdminEmailHandler'
-        }
-    },
-    'loggers': {
-        'django.request': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': True,
-        },
-    }
-}
diff --git a/UNCCScavenger-Server/UNCCScavenger_Server/scavenger/models.py b/UNCCScavenger-Server/UNCCScavenger_Server/scavenger/models.py
index fe9386c..98bb03a 100644
--- a/UNCCScavenger-Server/UNCCScavenger_Server/scavenger/models.py
+++ b/UNCCScavenger-Server/UNCCScavenger_Server/scavenger/models.py
@@ -7,6 +7,6 @@ class Location(models.Model):
 	riddle = models.CharField(max_length=512)
 	riddle_image_url = models.URLField()
 
-	location_long = models.DecimalField()
-	location_lat = models.DecimalField()
+	location_long = models.DecimalField(max_digits=10, decimal_places=7)
+	location_lat = models.DecimalField(max_digits=10, decimal_places=7)
 	result = models.TextField()
diff --git a/UNCCScavenger-Server/UNCCScavenger_Server/scavenger/serializers.py b/UNCCScavenger-Server/UNCCScavenger_Server/scavenger/serializers.py
index 6f509af..ce49794 100644
--- a/UNCCScavenger-Server/UNCCScavenger_Server/scavenger/serializers.py
+++ b/UNCCScavenger-Server/UNCCScavenger_Server/scavenger/serializers.py
@@ -5,7 +5,7 @@ from models import Location
 class LocationListSerializer(ModelSerializer):
 	class Meta:
 		model = Location
-		fields = ('id', 'name', 'riddle', 'location')
+		fields = ('id', 'name', 'riddle', 'location_long', 'location_lat')
 
 class LocationResultSerializer(ModelSerializer):
 	class Meta:
diff --git a/UNCCScavenger-Server/UNCCScavenger_Server/scavenger/views.py b/UNCCScavenger-Server/UNCCScavenger_Server/scavenger/views.py
index dd4aa81..67beee0 100644
--- a/UNCCScavenger-Server/UNCCScavenger_Server/scavenger/views.py
+++ b/UNCCScavenger-Server/UNCCScavenger_Server/scavenger/views.py
@@ -12,7 +12,7 @@ class LocationList(APIView):
 	def get(self, request, format=None):
 		locations = Location.objects.all()
 		locations_serializer = LocationListSerializer(locations, many=True)
-		return Response(serializer.data)
+		return Response(locations_serializer.data)
 
 class LocationResult(APIView):
 	'''