Merge branch 'master' of bitbucket.org:sanderroosendaal/rowsandall

Conflicts:
	manage.py

.gitignore

@@ -5,7 +5,7 @@
 /dist/
 /build/
 /docs/
-
+/media/
 
 # Python egg metadata, regenerated from source files by setuptools.
 *.egg-info
@@ -14,4 +14,7 @@
 *.*~
 
 # database
-*.sqlite3
+*.sqlite3
+
+# manage.py
+manage.py

manage.py

@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-import django
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "rowsandall_app.settings")
-#os.environ["DJANGO_SETTINGS_MODULE"] = "rowsandall_app.settings_dev"
-#django.setup()
-
-from django.core.wsgi import get_wsgi_application
-application = get_wsgi_application()
-
-from django.core.management import execute_from_command_line
-execute_from_command_line(sys.argv)
-